Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge branch 'sb/mv-submodule-fix' into HEAD | Junio C Hamano | 2016-05-18 | 1 | -0/+16 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | mv: allow moving nested submodulessb/mv-submodule-fix | Stefan Beller | 2016-04-19 | 1 | -0/+16 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'ld/p4-test-py3' into HEAD | Junio C Hamano | 2016-05-18 | 2 | -6/+7 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
| * | | | | | | | | git-p4 tests: time_in_seconds should use $PYTHON_PATHld/p4-test-py3 | Luke Diamand | 2016-04-26 | 1 | -1/+1 | |
| * | | | | | | | | git-p4 tests: work with python3 as well as python2 | Luke Diamand | 2016-04-26 | 2 | -5/+6 | |
| * | | | | | | | | git-p4 tests: cd to / before running python | Luke Diamand | 2016-04-26 | 1 | -1/+1 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'sb/submodule-path-misc-bugs' into maint | Junio C Hamano | 2016-05-06 | 2 | -5/+126 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | t7407: make expectation as clear as possiblesb/submodule-path-misc-bugs | Stefan Beller | 2016-03-30 | 1 | -2/+6 | |
| * | | | | | | | | submodule update: test recursive path reporting from subdirectory | Stefan Beller | 2016-03-30 | 1 | -0/+20 | |
| * | | | | | | | | 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 'jk/use-write-script-more' into maint | Junio C Hamano | 2016-05-02 | 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' into maint | Junio C Hamano | 2016-05-02 | 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' into maint | Junio C Hamano | 2016-05-02 | 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' into maint | Junio C Hamano | 2016-05-02 | 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' into maint | Junio C Hamano | 2016-05-02 | 1 | -1/+22 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | branch -m: update all per-worktree HEADs | Kazuki Yamaguchi | 2016-04-04 | 1 | -1/+22 | |
| | |_|_|_|/ / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'ky/branch-d-worktree' into maint | Junio C Hamano | 2016-05-02 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | branch -d: refuse deleting a branch which is currently checked outky/branch-d-worktree | Kazuki Yamaguchi | 2016-03-29 | 1 | -0/+6 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maint | Junio C Hamano | 2016-04-29 | 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 'sk/send-pack-all-fix' into maint | Junio C Hamano | 2016-04-29 | 1 | -0/+12 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | git-send-pack: fix --all option when used with directorysk/send-pack-all-fix | Stanislav Kolotinskiy | 2016-03-31 | 1 | -0/+12 | |
* | | | | | | | | | | | Merge branch 'sg/diff-multiple-identical-renames' into maint | Junio C Hamano | 2016-04-29 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | diffcore: fix iteration order of identical files during rename detectionsg/diff-multiple-identical-renames | SZEDER Gábor | 2016-03-30 | 1 | -0/+11 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'jv/merge-nothing-into-void' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+10 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | merge: fix NULL pointer dereference when merging nothing into voidjv/merge-nothing-into-void | Junio C Hamano | 2016-03-23 | 1 | -0/+10 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'ss/commit-squash-msg' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+28 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | commit: do not lose SQUASH_MSG contentsss/commit-squash-msg | Sven Strickroth | 2016-03-21 | 1 | -0/+28 | |
| | |_|_|_|/ / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'da/mergetool-delete-delete-conflict' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+64 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | mergetool: honor tempfile configuration when resolving delete conflictsda/mergetool-delete-delete-conflict | David Aguilar | 2016-03-10 | 1 | -0/+25 | |
| * | | | | | | | | | | mergetool: support delete/delete conflicts | David Aguilar | 2016-03-10 | 1 | -0/+39 | |
* | | | | | | | | | | | Merge branch 'jk/startup-info' into maint | Junio C Hamano | 2016-04-14 | 2 | -5/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | grep: turn off gitlink detection for --no-index | Jeff King | 2016-03-07 | 1 | -0/+27 | |
| * | | | | | | | | | | | setup: make startup_info available everywhere | Jeff King | 2016-03-06 | 1 | -5/+0 | |
* | | | | | | | | | | | | Merge branch 'jk/getwholeline-getdelim-empty' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | strbuf_getwholeline: NUL-terminate getdelim buffer on errorjk/getwholeline-getdelim-empty | Jeff King | 2016-03-05 | 1 | -0/+4 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'gf/fetch-pack-direct-object-fetch' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | fetch-pack: fix object_id of exact sha1 | Gabriel Souza Franco | 2016-03-01 | 1 | -0/+14 |