Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint-2.7' into maint | Junio C Hamano | 2016-05-26 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/war-on-sprintf' into maint-2.7 | Junio C Hamano | 2016-05-26 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | archive-tar: convert snprintf to xsnprintfjk/war-on-sprintf | Jeff King | 2016-05-26 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git 2.9-rc0v2.9.0-rc0 | Junio C Hamano | 2016-05-23 | 2 | -29/+50 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'svn-travis' of git://bogomips.org/git-svn | Junio C Hamano | 2016-05-23 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | travis-ci: enable Git SVN tests t91xx on Linux | Lars Schneider | 2016-05-22 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/rerere-multi' | Junio C Hamano | 2016-05-23 | 1 | -8/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rerere: remove an null statementjc/rerere-multi | Junio C Hamano | 2016-05-19 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rerere: plug memory leaks upon "rerere forget" failure | Junio C Hamano | 2016-05-11 | 1 | -8/+17 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/difftool' | Junio C Hamano | 2016-05-23 | 2 | -2/+30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | difftool: handle unmerged files in dir-diff modeda/difftool | David Aguilar | 2016-05-16 | 2 | -0/+28 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | difftool: initialize variables for readability | David Aguilar | 2016-05-16 | 1 | -2/+2 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/test-z-n-unquoted' | Junio C Hamano | 2016-05-23 | 15 | -115/+125 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | always quote shell arguments to test -z/-njk/test-z-n-unquoted | Jeff King | 2016-05-14 | 3 | -5/+5 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t9103: modernize test style | Jeff King | 2016-05-14 | 1 | -10/+12 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t9107: switch inverted single/double quotes in test | Jeff King | 2016-05-14 | 1 | -2/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t9107: use "return 1" instead of "exit 1" | Jeff King | 2016-05-14 | 1 | -16/+26 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t9100,t3419: enclose all test code in single-quotes | Jeff King | 2016-05-13 | 2 | -20/+20 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/lib-git-svn: drop $remote_git_svn and $git_svn_id | Jeff King | 2016-05-13 | 11 | -63/+60 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ar/diff-args-osx-precompose' | Junio C Hamano | 2016-05-23 | 5 | -0/+47 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | diff: run arguments through precompose_argvar/diff-args-osx-precompose | Alexander Rinass | 2016-05-13 | 5 | -0/+47 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/doc-lint' | Junio C Hamano | 2016-05-23 | 3 | -0/+76 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ci: validate "linkgit:" in documentationjc/doc-lint | Junio C Hamano | 2016-05-10 | 3 | -0/+76 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/perf-rebase-i' | Junio C Hamano | 2016-05-23 | 2 | -8/+47 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | perf: run "rebase -i" under perf | Johannes Schindelin | 2016-05-13 | 1 | -0/+36 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | perf: make the tests work in worktrees | Johannes Schindelin | 2016-05-13 | 1 | -7/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | perf: let's disable symlinks when they are not available | Johannes Schindelin | 2016-05-13 | 1 | -1/+4 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/test-parse-options-expect' | Junio C Hamano | 2016-05-23 | 2 | -60/+93 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t0040: convert a few tests to use test-parse-options --expectjc/test-parse-options-expect | Junio C Hamano | 2016-05-10 | 1 | -18/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t0040: remove unused test helpers | Junio C Hamano | 2016-05-10 | 1 | -24/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test-parse-options: --expect=<string> option to simplify tests | Junio C Hamano | 2016-05-10 | 2 | -15/+76 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test-parse-options: fix output when callback option fails | Junio C Hamano | 2016-05-10 | 2 | -5/+17 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pb/commit-verbose-config' | Junio C Hamano | 2016-05-23 | 8 | -74/+268 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit: add a commit.verbose config variablepb/commit-verbose-config | Pranit Bauva | 2016-05-10 | 4 | -1/+67 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7507-commit-verbose: improve test coverage by testing number of diffs | Pranit Bauva | 2016-05-05 | 1 | -7/+9 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parse-options.c: make OPTION_COUNTUP respect "unspecified" values | Pranit Bauva | 2016-05-05 | 4 | -17/+24 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/t7507: improve test coverage | Pranit Bauva | 2016-05-05 | 1 | -0/+5 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t0040-parse-options: improve test coverage | Pranit Bauva | 2016-05-05 | 1 | -0/+114 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test-parse-options: print quiet as integer | Pranit Bauva | 2016-04-19 | 2 | -14/+14 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t0040-test-parse-options.sh: fix style issues | Pranit Bauva | 2016-04-19 | 1 | -38/+38 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'xy/format-patch-base' | Junio C Hamano | 2016-05-23 | 6 | -1/+340 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: introduce format.useAutoBase configuration | Xiaolong Ye | 2016-04-26 | 3 | -6/+34 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: introduce --base=auto option | Xiaolong Ye | 2016-04-26 | 3 | -3/+72 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: add '--base' option to record base tree info | Xiaolong Ye | 2016-04-26 | 3 | -0/+240 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | patch-ids: make commit_patch_id() a public helper function | Xiaolong Ye | 2016-04-26 | 2 | -1/+3 | |
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/core-eol-fix' | Junio C Hamano | 2016-05-23 | 4 | -189/+141 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | convert.c: ident + core.autocrlf didn't worktb/core-eol-fix | Torsten Bögershausen | 2016-04-25 | 2 | -13/+8 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t0027: test cases for combined attributes | Torsten Bögershausen | 2016-04-25 | 1 | -169/+129 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | convert: allow core.autocrlf=input and core.eol=crlf | Torsten Bögershausen | 2016-04-25 | 2 | -7/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t0027: make commit_chk_wrnNNO() reliable | Torsten Bögershausen | 2016-04-25 | 1 | -1/+2 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |