Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jc/test-seq' into maint | Junio C Hamano | 2016-05-26 |
|\ | |||
| * | test-lib-functions.sh: rewrite test_seq without Perl | Junio C Hamano | 2016-05-09 |
| * | test-lib-functions.sh: remove misleading comment on test_seq | Junio C Hamano | 2016-05-09 |
* | | Merge branch 'tb/t5601-sed-fix' into maint | Junio C Hamano | 2016-05-26 |
|\ \ | |||
| * | | t5601: Remove trailing space in sed expression | Torsten Bögershausen | 2016-05-09 |
| |/ | |||
* | | Merge branch 'sb/clean-test-fix' into HEAD | Junio C Hamano | 2016-05-18 |
|\ \ | |||
| * | | t7300: mark test with SANITY | Stefan Beller | 2016-05-03 |
* | | | Merge branch 'sg/test-lib-simplify-expr-away' into HEAD | Junio C Hamano | 2016-05-18 |
|\ \ \ | |||
| * | | | test-lib: simplify '--option=value' parsing | SZEDER Gábor | 2016-04-22 |
* | | | | Merge branch 'js/close-packs-before-gc' into HEAD | Junio C Hamano | 2016-05-18 |
|\ \ \ \ | |||
| * | | | | t5510: run auto-gc in the foreground | SZEDER Gábor | 2016-05-02 |
* | | | | | Merge branch 'ls/p4-lfs' into HEAD | Junio C Hamano | 2016-05-18 |
|\ \ \ \ \ | |||
| * | | | | | git-p4: fix Git LFS pointer parsing | Lars Schneider | 2016-04-28 |
* | | | | | | Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEAD | Junio C Hamano | 2016-05-18 |
|\ \ \ \ \ \ | |||
| * | | | | | | t9824: fix wrong reference value | Lars Schneider | 2016-04-29 |
| * | | | | | | t9824: fix broken &&-chain in a subshell | SZEDER Gábor | 2016-04-24 |
* | | | | | | | Merge branch 'nf/mergetool-prompt' into HEAD | Junio C Hamano | 2016-05-18 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | difftool/mergetool: make the form of yes/no questions consistent | Nikola Forró | 2016-04-25 |
| | |_|_|_|/ / | |/| | | | | | |||
* | | | | | | | Merge branch 'jk/push-client-deadlock-fix' into HEAD | Junio C Hamano | 2016-05-18 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | t5504: drop sigpipe=ok from push tests | Jeff King | 2016-04-20 |
* | | | | | | | | Merge branch 'sb/mv-submodule-fix' into HEAD | Junio C Hamano | 2016-05-18 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | mv: allow moving nested submodules | Stefan Beller | 2016-04-19 |
| | |/ / / / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'ld/p4-test-py3' into HEAD | Junio C Hamano | 2016-05-18 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | git-p4 tests: time_in_seconds should use $PYTHON_PATH | Luke Diamand | 2016-04-26 |
| * | | | | | | | | git-p4 tests: work with python3 as well as python2 | Luke Diamand | 2016-04-26 |
| * | | | | | | | | git-p4 tests: cd to / before running python | Luke Diamand | 2016-04-26 |
| | |_|_|_|_|/ / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'sb/submodule-path-misc-bugs' into maint | Junio C Hamano | 2016-05-06 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | t7407: make expectation as clear as possible | Stefan Beller | 2016-03-30 |
| * | | | | | | | | submodule update: test recursive path reporting from subdirectory | Stefan Beller | 2016-03-30 |
| * | | | | | | | | submodule update: align reporting path for custom command execution | Stefan Beller | 2016-03-30 |
| * | | | | | | | | submodule status: correct path handling in recursive submodules | Stefan Beller | 2016-03-30 |
| * | | | | | | | | submodule update --init: correct path handling in recursive submodules | Stefan Beller | 2016-03-30 |
| * | | | | | | | | submodule foreach: correct path display in recursive submodules | Stefan Beller | 2016-03-30 |
| | |_|_|_|/ / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'jk/use-write-script-more' into maint | Junio C Hamano | 2016-05-02 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | t3404: use write_script | Junio C Hamano | 2016-04-12 |
| * | | | | | | | | t1020: do not overuse printf and use write_script | Junio C Hamano | 2016-04-11 |
| * | | | | | | | | t5532: use write_script | Jeff King | 2016-04-10 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'ad/commit-have-m-option' into maint | Junio C Hamano | 2016-05-02 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | commit: do not ignore an empty message given by -m '' | Jeff King | 2016-04-07 |
| * | | | | | | | | commit: --amend -m '' silently fails to wipe message | Adam Dinwoodie | 2016-04-07 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||
* | | | | | | | | Merge branch 'sb/submodule-helper-clone-regression-fix' into maint | Junio C Hamano | 2016-05-02 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | submodule--helper, module_clone: always operate on absolute paths | Stefan Beller | 2016-04-01 |
| * | | | | | | | | recursive submodules: test for relative paths | Stefan Beller | 2016-03-31 |
| * | | | | | | | | Merge 'hv/submodule-config' to 'sb/submodule-helper' | Junio C Hamano | 2015-08-19 |
| |\ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ | Merge branch 'jk/branch-shortening-funny-symrefs' into maint | Junio C Hamano | 2016-05-02 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | branch: fix shortening of non-remote symrefs | Jeff King | 2016-04-04 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'ky/branch-m-worktree' into maint | Junio C Hamano | 2016-05-02 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | branch -m: update all per-worktree HEADs | Kazuki Yamaguchi | 2016-04-04 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'ky/branch-d-worktree' into maint | Junio C Hamano | 2016-05-02 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | branch -d: refuse deleting a branch which is currently checked out | Kazuki Yamaguchi | 2016-03-29 |
| | |/ / / / / / / / | |/| | | | | | | | |