Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sb/clean-test-fix' | Junio C Hamano | 2016-05-10 | 1 | -1/+1 |
|\ | |||||
| * | t7300: mark test with SANITY | Stefan Beller | 2016-05-03 | 1 | -1/+1 |
* | | Merge branch 'js/close-packs-before-gc' | Junio C Hamano | 2016-05-10 | 1 | -0/+1 |
|\ \ | |||||
| * | | t5510: run auto-gc in the foreground | SZEDER Gábor | 2016-05-02 | 1 | -0/+1 |
* | | | Merge branch 'ls/p4-lfs' | Junio C Hamano | 2016-05-10 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | git-p4: fix Git LFS pointer parsing | Lars Schneider | 2016-04-28 | 1 | -0/+4 |
* | | | | Merge branch 'ls/p4-lfs-test-fix-2.7.0' | Junio C Hamano | 2016-05-06 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | t9824: fix wrong reference value | Lars Schneider | 2016-04-29 | 1 | -1/+1 |
| * | | | | t9824: fix broken &&-chain in a subshell | SZEDER Gábor | 2016-04-24 | 1 | -1/+1 |
* | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2016-05-06 | 1 | -7/+7 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'bw/rebase-merge-entire-branch' | Junio C Hamano | 2016-05-06 | 2 | -2/+11 |
|\ \ \ \ \ | |||||
| * | | | | | git-rebase--merge: don't include absent parent as a base | Ben Woosley | 2016-04-24 | 2 | -2/+11 |
* | | | | | | Merge branch 'js/http-custom-headers' | Junio C Hamano | 2016-05-06 | 2 | -0/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | http: support sending custom HTTP headers | Johannes Schindelin | 2016-04-27 | 2 | -0/+15 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'sb/clone-shallow-passthru' | Junio C Hamano | 2016-05-06 | 1 | -0/+85 |
|\ \ \ \ \ \ | |||||
| * | | | | | | clone: add `--shallow-submodules` flag | Stefan Beller | 2016-04-26 | 1 | -0/+85 |
* | | | | | | | Merge branch 'ld/p4-test-py3' | Junio C Hamano | 2016-05-06 | 2 | -6/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-p4 tests: time_in_seconds should use $PYTHON_PATH | 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 'nf/mergetool-prompt' | Junio C Hamano | 2016-05-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | difftool/mergetool: make the form of yes/no questions consistent | Nikola Forró | 2016-04-26 | 1 | -1/+1 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'sg/test-lib-simplify-expr-away' | Junio C Hamano | 2016-05-03 | 1 | -5/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | test-lib: simplify '--option=value' parsing | SZEDER Gábor | 2016-04-22 | 1 | -5/+5 |
| | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'jv/merge-nothing-into-void' into maint | Junio C Hamano | 2016-04-15 | 1 | -0/+10 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'ss/commit-squash-msg' into maint | Junio C Hamano | 2016-04-15 | 1 | -0/+28 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'da/mergetool-delete-delete-conflict' into maint | Junio C Hamano | 2016-04-15 | 1 | -0/+64 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/startup-info' into maint | Junio C Hamano | 2016-04-15 | 2 | -5/+27 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/getwholeline-getdelim-empty' into maint | Junio C Hamano | 2016-04-15 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'gf/fetch-pack-direct-object-fetch' into maint | Junio C Hamano | 2016-04-15 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/rev-parse-local-env-vars' into maint | Junio C Hamano | 2016-04-15 | 1 | -0/+45 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/config-get-urlmatch' into maint | Junio C Hamano | 2016-04-15 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pb/t7502-drop-dup' into maint | Junio C Hamano | 2016-04-15 | 1 | -5/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/test-httpd-config-nosystem' into maint | Junio C Hamano | 2016-04-15 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/clone-t57-t56' into maint | Junio C Hamano | 2016-04-15 | 10 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/index-pack' into maint | Junio C Hamano | 2016-04-15 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Merge branch 'jc/maint-index-pack-keep' into jc/index-pack | Junio C Hamano | 2016-03-03 | 1 | -0/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/name-rev-use-oldest-ref' | Junio C Hamano | 2016-05-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | name-rev: include taggerdate in considering the best name | Johannes Schindelin | 2016-04-22 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jd/p4-jobs-in-commit' | Junio C Hamano | 2016-05-03 | 3 | -42/+150 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | git-p4: add P4 jobs to git commit message | Jan Durovec | 2016-04-19 | 2 | -0/+108 |
| * | | | | | | | | | | | | | | | | | | | | git-p4: clean-up code style in tests | Jan Durovec | 2016-04-19 | 2 | -42/+42 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'st/verify-tag' | Junio C Hamano | 2016-04-29 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | t7030: test verifying multiple tags | Santiago Torres | 2016-04-18 | 1 | -0/+13 |
| | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/merge-refuse-new-root' | Junio C Hamano | 2016-04-29 | 2 | -1/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | pull: pass --allow-unrelated-histories to "git merge" | Junio C Hamano | 2016-04-21 | 1 | -0/+21 |
| * | | | | | | | | | | | | | | | | | | | | | t3033: avoid 'ambiguous refs' warning | Junio C Hamano | 2016-04-21 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/push-client-deadlock-fix' | Junio C Hamano | 2016-04-29 | 1 | -6/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | t5504: drop sigpipe=ok from push tests | Jeff King | 2016-04-20 | 1 | -6/+4 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/mv-submodule-fix' | Junio C Hamano | 2016-04-29 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |