summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t1402: work around shell quoting issue on NetBSDRené Scharfe2013-01-081-2/+4
* Merge branch 'ms/subtree-fixlets' into maintJunio C Hamano2013-01-082-1/+2
|\
| * git-subtree: fix typo in manpageMichael Schubert2012-12-221-1/+1
| * git-subtree: ignore git-subtree executableMichael Schubert2012-12-221-0/+1
* | Merge branch 'ss/nedmalloc-compilation' into maintJunio C Hamano2013-01-081-1/+4
|\ \
| * | nedmalloc: Fix a compile warning (exposed as error) with GCC 4.7.2Sebastian Schuberth2012-12-111-1/+4
* | | Merge branch 'jc/maint-fnmatch-old-style-definition' into maintJunio C Hamano2013-01-081-12/+12
|\ \ \
| * | | compat/fnmatch: update old-style definition to ANSIJunio C Hamano2012-12-191-12/+12
| | |/ | |/|
* | | Merge branch 'jc/test-portability' into maintJunio C Hamano2013-01-082-6/+10
|\ \ \
| * | | t9020: use configured Python to run the test helperJunio C Hamano2012-12-191-3/+7
| * | | t3600: Avoid "cp -a", which is a GNUismJunio C Hamano2012-12-191-3/+3
| * | | Merge branch 'jc/maint-test-portability' into 'jc/test-portability'Junio C Hamano2012-12-193-6/+8
| |\ \ \
* | \ \ \ Merge branch 'jc/maint-fbsd-sh-ifs-workaround' into maintJunio C Hamano2013-01-081-2/+5
|\ \ \ \ \
| * | | | | sh-setup: work around "unset IFS" bug in some shellsJunio C Hamano2012-12-101-2/+5
* | | | | | Merge branch 'jc/mkstemp-more-careful-error-reporting' into maintJunio C Hamano2013-01-081-1/+1
|\ \ \ \ \ \
| * | | | | | xmkstemp(): avoid showing truncated template more carefullyJunio C Hamano2012-12-181-1/+1
* | | | | | | Merge branch 'jc/test-cvs-no-init-in-existing-dir' into maintJunio C Hamano2013-01-081-1/+2
|\ \ \ \ \ \ \
| * | | | | | | t9200: let "cvs init" create the test repositoryJunio C Hamano2012-12-241-1/+2
* | | | | | | | Merge branch 'jc/maint-test-portability' into maintJunio C Hamano2013-01-083-6/+8
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | t4014: fix arguments to grepJunio C Hamano2012-12-191-3/+3
| * | | | | | | t9502: do not assume GNU tarJunio C Hamano2012-12-191-1/+1
| * | | | | | | t0200: "locale" may not existJunio C Hamano2012-12-191-2/+4
| | |_|_|_|/ / | |/| | | | |
* | | | | | | remote-hg: Fix biridectionality -> bidirectionality typosW. Trevor King2013-01-082-2/+2
* | | | | | | Git 1.8.1v1.8.1Junio C Hamano2012-12-313-16/+21
* | | | | | | Merge branch 'so/prompt-command'Junio C Hamano2012-12-271-12/+20
|\ \ \ \ \ \ \
| * | | | | | | make __git_ps1 accept a third parameter in pcmodeSimon Oosthoek2012-12-261-12/+20
* | | | | | | | Sync with 1.8.0.3Junio C Hamano2012-12-272-1/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Git 1.8.0.3v1.8.0.3maint-1.8.0Junio C Hamano2012-12-274-3/+18
| * | | | | | | | git(1): show link to contributor summary pageJunio C Hamano2012-12-271-1/+4
| * | | | | | | | Merge branch 'sl/maint-git-svn-docs' into maintJunio C Hamano2012-12-271-6/+85
| |\ \ \ \ \ \ \ \
| | * | | | | | | | git-svn: Note about tags.Sebastian Leske2012-12-271-0/+6
| | * | | | | | | | git-svn: Expand documentation for --follow-parentSebastian Leske2012-12-271-3/+12
| | * | | | | | | | git-svn: Recommend use of structure options.Sebastian Leske2012-12-271-3/+21
| | * | | | | | | | git-svn: Document branches with at-sign(@).Sebastian Leske2012-12-271-0/+46
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'gb/maint-doc-svn-log-window-size' into maintJunio C Hamano2012-12-271-0/+7
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'km/maint-doc-git-reset' into maintJunio C Hamano2012-12-271-4/+4
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-remote-helpers.txt: document invocation before input formatMax Horn2012-12-271-31/+31
| * | | | | | | | | | Merge branch 'jk/avoid-mailto-invalid-in-doc' into maintJunio C Hamano2012-12-273-3/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'tj/maint-doc-commit-sign' into maintJunio C Hamano2012-12-271-1/+5
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation: move diff.wordRegex from config.txt to diff-config.txtRamkumar Ramachandra2012-12-272-6/+6
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-12-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'jc/doc-diff-blobs' into maintJunio C Hamano2012-12-221-2/+7
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cr/doc-checkout-branch' into maintJunio C Hamano2012-12-221-10/+41
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ta/api-index-doc' into maintJunio C Hamano2012-12-221-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'as/doc-for-devs' into maintJunio C Hamano2012-12-222-13/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sl/readme-gplv2' into maintJunio C Hamano2012-12-221-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/fetch-tags-doc' into maintJunio C Hamano2012-12-221-8/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/index-format-doc' into maintJunio C Hamano2012-12-221-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/mailmap-cleanup' into maintJunio C Hamano2012-12-222-33/+82
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ta/doc-cleanup' into maintJunio C Hamano2012-12-2220-68/+134
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \