summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t4204: do not let $name variable clobberedak/t4204-shell-portabilityJunio C Hamano2016-05-241-3/+3
* 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
| * | | | | | | | test-parse-options: fix output when callback option failsJunio C Hamano2016-05-102-5/+17
* | | | | | | | | Merge branch 'pb/commit-verbose-config'Junio C Hamano2016-05-238-74/+268
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | commit: add a commit.verbose config variablepb/commit-verbose-configPranit Bauva2016-05-104-1/+67
| * | | | | | | | t7507-commit-verbose: improve test coverage by testing number of diffsPranit Bauva2016-05-051-7/+9
| * | | | | | | | parse-options.c: make OPTION_COUNTUP respect "unspecified" valuesPranit Bauva2016-05-054-17/+24
| * | | | | | | | t/t7507: improve test coveragePranit Bauva2016-05-051-0/+5
| * | | | | | | | t0040-parse-options: improve test coveragePranit Bauva2016-05-051-0/+114
| * | | | | | | | test-parse-options: print quiet as integerPranit Bauva2016-04-192-14/+14
| * | | | | | | | t0040-test-parse-options.sh: fix style issuesPranit Bauva2016-04-191-38/+38
* | | | | | | | | Merge branch 'xy/format-patch-base'Junio C Hamano2016-05-236-1/+340
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | format-patch: introduce format.useAutoBase configurationXiaolong Ye2016-04-263-6/+34
| * | | | | | | | | format-patch: introduce --base=auto optionXiaolong Ye2016-04-263-3/+72
| * | | | | | | | | format-patch: add '--base' option to record base tree infoXiaolong Ye2016-04-263-0/+240
| * | | | | | | | | patch-ids: make commit_patch_id() a public helper functionXiaolong Ye2016-04-262-1/+3
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'tb/core-eol-fix'Junio C Hamano2016-05-234-189/+141
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | convert.c: ident + core.autocrlf didn't worktb/core-eol-fixTorsten Bögershausen2016-04-252-13/+8
| * | | | | | | | | t0027: test cases for combined attributesTorsten Bögershausen2016-04-251-169/+129
| * | | | | | | | | convert: allow core.autocrlf=input and core.eol=crlfTorsten Bögershausen2016-04-252-7/+3
| * | | | | | | | | t0027: make commit_chk_wrnNNO() reliableTorsten Bögershausen2016-04-251-1/+2
| |/ / / / / / / /
* | | | | | | | | Merge branch 'nd/worktree-various-heads'Junio C Hamano2016-05-2317-82/+344
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | branch: do not rename a branch under bisect or rebasend/worktree-various-headsNguyễn Thái Ngọc Duy2016-04-224-4/+40