Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | | | | | | | | | | | | | | Merge branch 'jd/p4-jobs-in-commit' | Junio C Hamano | 2016-05-03 | 3 | -42/+150 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | git-p4: add P4 jobs to git commit messagejd/p4-jobs-in-commit | 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"jc/merge-refuse-new-root | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | mv: allow moving nested submodulessb/mv-submodule-fix | Stefan Beller | 2016-04-19 | 1 | -0/+16 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/test-helpers' | Junio C Hamano | 2016-04-29 | 37 | -3/+2319 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | test helpers: move test-* to t/helper/ subdirectory | Nguyễn Thái Ngọc Duy | 2016-04-15 | 37 | -3/+2319 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-path-misc-bugs' | Junio C Hamano | 2016-04-25 | 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 '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 |