Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sb/submodule-init' | Junio C Hamano | 2016-05-17 | 3 | -6/+80 |
|\ | |||||
| * | submodule init: redirect stdout to stderr | Stefan Beller | 2016-05-03 | 1 | -6/+18 |
| * | submodule--helper update-clone: abort gracefully on missing .gitmodules | Stefan Beller | 2016-04-29 | 1 | -0/+8 |
| * | submodule init: fail gracefully with a missing .gitmodules file | Stefan Beller | 2016-04-29 | 1 | -0/+8 |
| * | submodule: port resolve_relative_url from shell to C | Stefan Beller | 2016-04-16 | 1 | -0/+46 |
| * | Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init | Junio C Hamano | 2016-04-14 | 155 | -837/+3270 |
| |\ | |||||
| * \ | Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-init | Junio C Hamano | 2016-04-14 | 1 | -0/+41 |
| |\ \ | |||||
* | \ \ | Merge branch 'sb/submodule-module-list-pathspec-fix' | Junio C Hamano | 2016-05-13 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | submodule deinit test: fix broken && chain in subshellsb/submodule-module-list-pathspec-fix | Stefan Beller | 2016-05-03 | 1 | -1/+1 |
* | | | | | Merge branch 'jc/commit-tree-ignore-commit-gpgsign' | Junio C Hamano | 2016-05-13 | 1 | -3/+10 |
|\ \ \ \ \ | |||||
| * | | | | | commit-tree: do not pay attention to commit.gpgsignjc/commit-tree-ignore-commit-gpgsign | Junio C Hamano | 2016-05-03 | 1 | -3/+10 |
* | | | | | | Merge branch 'sb/clean-test-fix' | Junio C Hamano | 2016-05-10 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t7300: mark test with SANITYsb/clean-test-fix | 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 foregroundjs/close-packs-before-gc | 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 valuels/p4-lfs-test-fix-2.7.0 | 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 basebw/rebase-merge-entire-branch | 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_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 'nf/mergetool-prompt' | Junio C Hamano | 2016-05-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | difftool/mergetool: make the form of yes/no questions consistentnf/mergetool-prompt | Nikola Forró | 2016-04-25 | 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' parsingsg/test-lib-simplify-expr-away | SZEDER Gábor | 2016-04-22 | 1 | -5/+5 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'jv/merge-nothing-into-void' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'ss/commit-squash-msg' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+28 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'da/mergetool-delete-delete-conflict' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+64 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/startup-info' into maint | Junio C Hamano | 2016-04-14 | 2 | -5/+27 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/getwholeline-getdelim-empty' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'gf/fetch-pack-direct-object-fetch' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/rev-parse-local-env-vars' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+45 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/config-get-urlmatch' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pb/t7502-drop-dup' into maint | Junio C Hamano | 2016-04-14 | 1 | -5/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/test-httpd-config-nosystem' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/clone-t57-t56' into maint | Junio C Hamano | 2016-04-14 | 10 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/index-pack' into maint | Junio C Hamano | 2016-04-14 | 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 namejs/name-rev-use-oldest-ref | Johannes Schindelin | 2016-04-22 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | |