summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t9117: use --prefix "" instead of --prefix=""km/git-svn-workaround-older-getopt-longKyle J. McKay2014-04-232-4/+7
* Update draft release notes to 2.0Junio C Hamano2014-04-211-3/+12
* Merge git://bogomips.org/git-svnJunio C Hamano2014-04-2120-153/+131
|\
| * Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not givenJohan Herland2014-04-1920-153/+131
* | Merge branch 'jx/i18n'Junio C Hamano2014-04-215-15/+15
|\ \
| * | i18n: mention "TRANSLATORS:" marker in Documentation/CodingGuidelinesjx/i18nJunio C Hamano2014-04-181-0/+10
| * | i18n: only extract comments marked with "TRANSLATORS:"Jiang Xin2014-04-172-6/+4
| * | i18n: remove obsolete comments for translators in diffstat generationJiang Xin2014-04-171-8/+0
| * | i18n: fix uncatchable comments for translators in date.cJiang Xin2014-04-171-1/+1
* | | Merge branch 'km/avoid-non-function-return-in-rebase'Junio C Hamano2014-04-214-10/+46
|\ \ \
| * | | Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"km/avoid-non-function-return-in-rebaseKyle J. McKay2014-04-171-10/+1
| * | | rebase: avoid non-function use of "return" on FreeBSDKyle J. McKay2014-04-173-0/+45
* | | | Merge branch 'ep/shell-command-substitution'Junio C Hamano2014-04-2114-48/+48
|\ \ \ \ | |_|_|/ |/| | |
| * | | t9362-mw-to-git-utf8.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-2/+2
| * | | t9360-mw-to-git-clone.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-7/+7
| * | | git-tag.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-1/+1
| * | | git-revert.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-1/+1
| * | | git-resolve.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-1/+1
| * | | git-repack.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-1/+1
| * | | git-merge.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-2/+2
| * | | git-ls-remote.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-2/+2
| * | | git-fetch.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-3/+3
| * | | git-commit.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-5/+5
| * | | git-clone.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-10/+10
| * | | git-checkout.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-4/+4
| * | | install-webdoc.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-3/+3
| * | | howto-index.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-6/+6
* | | | Git 2.0-rc0v2.0.0-rc0Junio C Hamano2014-04-182-1/+6
* | | | Merge branch 'jk/config-die-bad-number-noreturn'Junio C Hamano2014-04-181-0/+1
|\ \ \ \
| * | | | config.c: mark die_bad_number as NORETURNjk/config-die-bad-number-noreturnJeff King2014-04-161-0/+1
* | | | | Merge branch 'fc/remote-helper-fixes'Junio C Hamano2014-04-185-5/+34
|\ \ \ \ \
| * | | | | remote-bzr: trivial test fixfc/remote-helper-fixesFelipe Contreras2014-04-141-1/+1
| * | | | | remote-bzr: include authors field in pushed commitsdequis2014-04-092-0/+26
| * | | | | remote-bzr: add support for older versionsFelipe Contreras2014-04-091-2/+2
| * | | | | remote-hg: always normalize pathsFelipe Contreras2014-04-091-0/+1
| * | | | | remote-helpers: allow all tests running from any dirFelipe Contreras2014-04-092-2/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'fc/complete-aliased-push'Junio C Hamano2014-04-182-0/+2
|\ \ \ \ \
| * | | | | completion: fix completing args of aliased "push", "fetch", etc.fc/complete-aliased-pushFelipe Contreras2014-04-092-0/+2
* | | | | | Merge branch 'fc/prompt-zsh-read-from-file'Junio C Hamano2014-04-181-7/+14
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | prompt: fix missing file errors in zshFelipe Contreras2014-04-141-7/+14
| |/ / / /
* | | | | Update draft release notes for 2.0Junio C Hamano2014-04-161-0/+11
* | | | | Merge branch 'mh/multimail'Junio C Hamano2014-04-165-56/+249
|\ \ \ \ \
| * | | | | git-multimail: update to version 1.0.0mh/multimailMichael Haggerty2014-04-075-56/+249
* | | | | | Merge branch 'tb/unicode-6.3-zero-width'Junio C Hamano2014-04-161-5/+4
|\ \ \ \ \ \
| * | | | | | utf8.c: partially update to version 6.3Torsten Bögershausen2014-04-091-5/+4
| |/ / / / /
* | | | | | Merge branch 'km/avoid-cp-a'Junio C Hamano2014-04-161-2/+2
|\ \ \ \ \ \
| * | | | | | test: fix t7001 cp to use POSIX optionskm/avoid-cp-aKyle J. McKay2014-04-111-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'km/avoid-bs-in-shell-glob'Junio C Hamano2014-04-161-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | test: fix t5560 on FreeBSDkm/avoid-bs-in-shell-globKyle J. McKay2014-04-111-2/+2
| |/ / / /
* | | | | Sync with 1.9.2Junio C Hamano2014-04-093-2/+23
|\ \ \ \ \ | | |_|/ / | |/| | |