summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* blame: require 0 context lines while finding moved lines with -Mks/blame-move-no-reason-for-1-line-contextdk/blame-move-no-reason-for-1-line-contextDavid Kastrup2016-05-291-4/+3
* 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
| * | | | | | | | | | | | | | | | | | | | | | | t/lib-git-svn: drop $remote_git_svn and $git_svn_idJeff King2016-05-1311-63/+60
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ar/diff-args-osx-precompose'Junio C Hamano2016-05-235-0/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | diff: run arguments through precompose_argvar/diff-args-osx-precomposeAlexander Rinass2016-05-135-0/+47
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/doc-lint'Junio C Hamano2016-05-233-0/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | ci: validate "linkgit:" in documentationjc/doc-lintJunio C Hamano2016-05-103-0/+76
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/perf-rebase-i'Junio C Hamano2016-05-232-8/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | perf: run "rebase -i" under perfJohannes Schindelin2016-05-131-0/+36
| * | | | | | | | | | | | | | | | | | | | | | | | | | perf: make the tests work in worktreesJohannes Schindelin2016-05-131-7/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | perf: let's disable symlinks when they are not availableJohannes Schindelin2016-05-131-1/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/test-parse-options-expect'Junio C Hamano2016-05-232-60/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t0040: convert a few tests to use test-parse-options --expectjc/test-parse-options-expectJunio C Hamano2016-05-101-18/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t0040: remove unused test helpersJunio C Hamano2016-05-101-24/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | test-parse-options: --expect=<string> option to simplify testsJunio C Hamano2016-05-102-15/+76