Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | submodule update: align reporting path for custom command execution | Stefan Beller | 2016-03-30 | 1 | -3/+26 | |
| * | | | | | | | | | | | | | | | | | | | | | | | submodule status: correct path handling in recursive submodules | Stefan Beller | 2016-03-30 | 1 | -0/+21 | |
| * | | | | | | | | | | | | | | | | | | | | | | | submodule update --init: correct path handling in recursive submodules | Stefan Beller | 2016-03-30 | 1 | -0/+33 | |
| * | | | | | | | | | | | | | | | | | | | | | | | submodule foreach: correct path display in recursive submodules | Stefan Beller | 2016-03-30 | 1 | -0/+20 | |
| | |_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'en/merge-trivial-fix' | Junio C Hamano | 2016-04-25 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | builtin/merge.c: fix a bug with trivial mergesen/merge-trivial-fix | Elijah Newren | 2016-04-12 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | t7605: add a testcase demonstrating a bug with trivial merges | Elijah Newren | 2016-04-12 | 1 | -1/+5 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'en/merge-octopus-fix' | Junio C Hamano | 2016-04-25 | 1 | -0/+153 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | merge-octopus: abort if index does not match HEADen/merge-octopus-fix | Elijah Newren | 2016-04-12 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | t6044: new merge testcases for when index doesn't match HEAD | Elijah Newren | 2016-04-12 | 1 | -0/+153 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dt/pre-refs-backend' | Junio C Hamano | 2016-04-25 | 2 | -11/+131 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | refs: on symref reflog expire, lock symref not referrentdt/pre-refs-backend | David Turner | 2016-04-10 | 1 | -0/+10 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | t1430: improve test coverage of deletion of badly-named refs | Michael Haggerty | 2016-04-10 | 1 | -8/+96 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | t1430: test for-each-ref in the presence of badly-named refs | Michael Haggerty | 2016-04-10 | 1 | -0/+16 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | t1430: don't rely on symbolic-ref for creating broken symrefs | Michael Haggerty | 2016-04-10 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | t1430: clean up broken refs/tags/shadow | Michael Haggerty | 2016-04-10 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | t1430: test the output and error of some commands more carefully | Michael Haggerty | 2016-04-10 | 1 | -6/+12 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/rerere-multi' | Junio C Hamano | 2016-04-25 | 1 | -1/+169 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | rerere: adjust 'forget' to multi-variant world order | Junio C Hamano | 2016-04-06 | 1 | -0/+10 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | rerere: gc and clear | Junio C Hamano | 2016-04-06 | 1 | -6/+75 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | rerere: do use multiple variants | Junio C Hamano | 2016-03-15 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | t4200: rerere a merge with two identical conflicts | Junio C Hamano | 2016-03-15 | 1 | -0/+74 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | rerere: handle leftover rr-cache/$ID directory and postimage files | Junio C Hamano | 2016-03-15 | 1 | -1/+16 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/use-write-script-more' | Junio C Hamano | 2016-04-22 | 3 | -18/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t3404: use write_scriptjk/use-write-script-more | Junio C Hamano | 2016-04-12 | 1 | -4/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t1020: do not overuse printf and use write_script | Junio C Hamano | 2016-04-11 | 1 | -5/+5 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t5532: use write_script | Jeff King | 2016-04-10 | 1 | -9/+12 | |
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ad/commit-have-m-option' | Junio C Hamano | 2016-04-22 | 1 | -0/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | commit: do not ignore an empty message given by -m ''ad/commit-have-m-option | Jeff King | 2016-04-07 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | commit: --amend -m '' silently fails to wipe message | Adam Dinwoodie | 2016-04-07 | 1 | -0/+20 | |
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-helper-clone-regression-fix' | Junio C Hamano | 2016-04-22 | 1 | -0/+41 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | submodule--helper, module_clone: always operate on absolute paths | Stefan Beller | 2016-04-01 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | recursive submodules: test for relative paths | Stefan Beller | 2016-03-31 | 1 | -0/+41 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge 'hv/submodule-config' to 'sb/submodule-helper' | Junio C Hamano | 2015-08-19 | 1 | -0/+153 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/branch-shortening-funny-symrefs' | Junio C Hamano | 2016-04-18 | 1 | -0/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | branch: fix shortening of non-remote symrefsjk/branch-shortening-funny-symrefs | Jeff King | 2016-04-04 | 1 | -0/+12 | |
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ky/branch-m-worktree' | Junio C Hamano | 2016-04-18 | 1 | -1/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | branch -m: update all per-worktree HEADs | Kazuki Yamaguchi | 2016-04-04 | 1 | -1/+22 | |
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' | Junio C Hamano | 2016-04-13 | 1 | -0/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | correct blame for files commited with CRLFtb/blame-force-read-cache-to-workaround-safe-crlf | Torsten Bögershausen | 2016-04-05 | 1 | -0/+14 | |
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'lt/pretty-expand-tabs' | Junio C Hamano | 2016-04-13 | 2 | -1/+106 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: test --expand-tabslt/pretty-expand-tabs | Junio C Hamano | 2016-04-04 | 1 | -0/+105 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: enable --expand-tabs by default for selected pretty formats | Junio C Hamano | 2016-03-30 | 1 | -1/+1 | |
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mj/pull-rebase-autostash' | Junio C Hamano | 2016-04-13 | 1 | -7/+67 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: test --[no-]autostash with pull.rebase=truemj/pull-rebase-autostash | Mehul Jain | 2016-04-04 | 1 | -0/+10 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: reduce commom lines of code | Mehul Jain | 2016-04-04 | 1 | -9/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: factor out common "failing autostash" code | Mehul Jain | 2016-04-04 | 1 | -15/+11 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: factor out common "successful autostash" code | Mehul Jain | 2016-04-04 | 1 | -29/+15 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: use better test to check stderr output | Mehul Jain | 2016-04-04 | 1 | -6/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: ensure consistent test conditions | Mehul Jain | 2016-04-04 | 1 | -0/+2 |