summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* upload-pack.c: use parse-options APIaq/upload-pack-use-parse-optionsAntoine Queru2016-05-312-36/+37
* Final batch before 2.9-rc1Junio C Hamano2016-05-291-0/+11
* Merge branch 'ak/t0008-ksh88-workaround'Junio C Hamano2016-05-291-2/+2
|\
| * t0008: 4 tests fail with ksh88ak/t0008-ksh88-workaroundArmin Kunaschik2016-05-201-2/+2
* | Merge branch 'js/t6044-use-test-seq'Junio C Hamano2016-05-291-2/+2
|\ \
| * | t6044: replace seq by test_seqjs/t6044-use-test-seqJohannes Sixt2016-05-181-2/+2
* | | Merge branch 'ak/t4204-shell-portability'Junio C Hamano2016-05-291-3/+3
|\ \ \
| * | | t4204: do not let $name variable clobberedak/t4204-shell-portabilityJunio C Hamano2016-05-241-3/+3
* | | | Merge branch 'rj/log-decorate-auto'Junio C Hamano2016-05-292-4/+9
|\ \ \ \
| * | | | log: document the --decorate=auto optionrj/log-decorate-autoRamsay Jones2016-05-272-4/+9
* | | | | Merge branch 'mr/send-email-doc-gmail-2fa'Junio C Hamano2016-05-291-0/+13
|\ \ \ \ \
| * | | | | Documentation: add instructions to help setup gmail 2FAMichael Rappazzo2016-05-271-0/+13
* | | | | | Merge branch 'kb/msys2-tty'Junio C Hamano2016-05-292-5/+56
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | mingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*)kb/msys2-ttyKarsten Blees2016-05-262-5/+56
* | | | | | Sync with maintJunio C Hamano2016-05-262-1/+28
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Start preparing for 2.8.4Junio C Hamano2016-05-261-0/+27
| * | | | | Merge branch 'jc/linkgit-fix' into maintJunio C Hamano2016-05-268-10/+10
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ls/travis-build-doc' into maintJunio C Hamano2016-05-262-0/+29
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/fsck-nul-in-commit' into maintJunio C Hamano2016-05-262-3/+31
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/rebase-interative-eval-fix' into maintJunio C Hamano2016-05-261-0/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/windows-dotgit' into maintJunio C Hamano2016-05-268-3/+147
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'kf/gpg-sig-verification-doc' into maintJunio C Hamano2016-05-262-4/+7
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'lp/typofixes' into maintJunio C Hamano2016-05-2612-14/+14
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/z-is-gnutar-ism' into maintJunio C Hamano2016-05-262-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'va/i18n-misc-updates' into maintJunio C Hamano2016-05-268-61/+111
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bn/config-doc-tt-varnames' into maintJunio C Hamano2016-05-261-21/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/remote-plural-ours-plus-theirs' into maintJunio C Hamano2016-05-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ak/t4151-ls-files-could-be-empty' into maintJunio C Hamano2016-05-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/test-seq' into maintJunio C Hamano2016-05-261-15/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/t5601-sed-fix' into maintJunio C Hamano2016-05-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'va/i18n-remote-comment-to-align' into maintJunio C Hamano2016-05-261-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'va/mailinfo-doc-typofix' into maintJunio C Hamano2016-05-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-2.7' into maintJunio C Hamano2016-05-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'jk/war-on-sprintf' into maint-2.7Junio C Hamano2016-05-261-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | archive-tar: convert snprintf to xsnprintfjk/war-on-sprintfJeff King2016-05-261-1/+1
* | | | | | | | | | | | | | | | | | | | | | | Git 2.9-rc0v2.9.0-rc0Junio C Hamano2016-05-232-29/+50
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'svn-travis' of git://bogomips.org/git-svnJunio C Hamano2016-05-231-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | travis-ci: enable Git SVN tests t91xx on LinuxLars Schneider2016-05-221-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/rerere-multi'Junio C Hamano2016-05-231-8/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | rerere: remove an null statementjc/rerere-multiJunio C Hamano2016-05-191-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | rerere: plug memory leaks upon "rerere forget" failureJunio C Hamano2016-05-111-8/+17
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/difftool'Junio C Hamano2016-05-232-2/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | difftool: handle unmerged files in dir-diff modeda/difftoolDavid Aguilar2016-05-162-0/+28
| * | | | | | | | | | | | | | | | | | | | | | | | | difftool: initialize variables for readabilityDavid Aguilar2016-05-161-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/test-z-n-unquoted'Junio C Hamano2016-05-2315-115/+125
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | always quote shell arguments to test -z/-njk/test-z-n-unquotedJeff King2016-05-143-5/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | t9103: modernize test styleJeff King2016-05-141-10/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | t9107: switch inverted single/double quotes in testJeff King2016-05-141-2/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | t9107: use "return 1" instead of "exit 1"Jeff King2016-05-141-16/+26
| * | | | | | | | | | | | | | | | | | | | | | | | | | t9100,t3419: enclose all test code in single-quotesJeff King2016-05-132-20/+20