Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test-parse-options: fix output when callback option fails | Junio C Hamano | 2016-05-10 | 1 | -3/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pb/commit-verbose-config' | Junio C Hamano | 2016-05-23 | 3 | -71/+244 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit: add a commit.verbose config variablepb/commit-verbose-config | Pranit Bauva | 2016-05-10 | 1 | -0/+51 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -14/+14 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -13/+13 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+105 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: introduce format.useAutoBase configuration | Xiaolong Ye | 2016-04-26 | 1 | -0/+19 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: introduce --base=auto option | Xiaolong Ye | 2016-04-26 | 1 | -0/+39 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: add '--base' option to record base tree info | Xiaolong Ye | 2016-04-26 | 1 | -0/+47 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/core-eol-fix' | Junio C Hamano | 2016-05-23 | 1 | -170/+131 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | convert.c: ident + core.autocrlf didn't worktb/core-eol-fix | Torsten Bögershausen | 2016-04-25 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t0027: test cases for combined attributes | Torsten Bögershausen | 2016-04-25 | 1 | -169/+129 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t0027: make commit_chk_wrnNNO() reliable | Torsten Bögershausen | 2016-04-25 | 1 | -1/+2 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/worktree-various-heads' | Junio C Hamano | 2016-05-23 | 1 | -0/+59 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | branch: do not rename a branch under bisect or rebasend/worktree-various-heads | Nguyễn Thái Ngọc Duy | 2016-04-22 | 1 | -0/+8 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree.c: check whether branch is bisected in another worktree | Nguyễn Thái Ngọc Duy | 2016-04-22 | 1 | -0/+13 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree.c: check whether branch is rebased in another worktree | Nguyễn Thái Ngọc Duy | 2016-04-22 | 1 | -0/+38 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op' | Junio C Hamano | 2016-05-23 | 1 | -0/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wt-status.c: set commitable bit if there is a meaningful merge.ss/commit-dry-run-resolve-merge-to-no-op | Stephen P. Smith | 2016-02-17 | 1 | -0/+20 | |
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/windows-dotgit' | Junio C Hamano | 2016-05-17 | 2 | -0/+50 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mingw: introduce the 'core.hideDotFiles' setting | Johannes Schindelin | 2016-05-11 | 2 | -0/+50 | |
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/test-send-sh-x-trace-elsewhere' | Junio C Hamano | 2016-05-17 | 2 | -3/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test-lib: set BASH_XTRACEFD automaticallyjk/test-send-sh-x-trace-elsewhere | Jeff King | 2016-05-11 | 2 | -3/+16 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/http-custom-headers' | Junio C Hamano | 2016-05-17 | 2 | -6/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule: ensure that -c http.extraheader is heededjs/http-custom-headers | Johannes Schindelin | 2016-05-10 | 1 | -1/+10 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/submodule-c-credential' into js/http-custom-headers | Junio C Hamano | 2016-05-10 | 2 | -0/+63 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5551: make the test for extra HTTP headers more robust | Johannes Schindelin | 2016-05-10 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: adjust the configuration for Apache 2.2 | Johannes Schindelin | 2016-05-10 | 1 | -4/+12 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/fsck-nul-in-commit' | Junio C Hamano | 2016-05-17 | 1 | -0/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fsck: detect and warn a commit with embedded NULjc/fsck-nul-in-commit | Junio C Hamano | 2016-05-10 | 1 | -0/+18 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/ll-merge-internal' | Junio C Hamano | 2016-05-17 | 2 | -85/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t6036: remove pointless test that expects failurejc/ll-merge-internal | Junio C Hamano | 2016-05-09 | 1 | -83/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ll-merge: use a longer conflict marker for internal merge | Junio C Hamano | 2016-05-09 | 2 | -2/+3 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/t5601-sed-fix' | Junio C Hamano | 2016-05-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5601: Remove trailing space in sed expressiontb/t5601-sed-fix | Torsten Bögershausen | 2016-05-09 | 1 | -1/+1 | |
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/test-seq' | Junio C Hamano | 2016-05-17 | 1 | -15/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test-lib-functions.sh: rewrite test_seq without Perljc/test-seq | Junio C Hamano | 2016-05-09 | 1 | -1/+6 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test-lib-functions.sh: remove misleading comment on test_seq | Junio C Hamano | 2016-05-09 | 1 | -14/+7 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/test-gpg-tags' | Junio C Hamano | 2016-05-17 | 1 | -23/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t6302: simplify non-gpg caseses/test-gpg-tags | Jeff King | 2016-05-09 | 1 | -23/+22 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ak/t4151-ls-files-could-be-empty' | Junio C Hamano | 2016-05-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t4151: make sure argument to 'test -z' is givenak/t4151-ls-files-could-be-empty | Armin Kunaschik | 2016-05-09 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |