Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | transport-helper: mark failure for atomic push | Jiang Xin | 2020-04-17 | 2 | -6/+13 |
* | send-pack: mark failure of atomic push properly | Jiang Xin | 2020-04-17 | 3 | -5/+5 |
* | t5543: never report what we do not push | Jiang Xin | 2020-04-17 | 1 | -0/+89 |
* | send-pack: fix inconsistent porcelain output | Jiang Xin | 2020-04-17 | 3 | -0/+282 |
* | Merge branch 'en/rebase-backend' | Junio C Hamano | 2020-03-21 | 1 | -1/+1 |
|\ | |||||
| * | t3419: prevent failure when run with EXPENSIVE | brian m. carlson | 2020-03-20 | 1 | -1/+1 |
* | | Merge branch 'en/test-cleanup' | Junio C Hamano | 2020-03-16 | 2 | -23/+17 |
|\ \ | |||||
| * | | t6022, t6046: fix flaky files-are-updated checks | Elijah Newren | 2020-03-13 | 2 | -23/+17 |
* | | | Merge branch 'es/outside-repo-errmsg-hints' | Junio C Hamano | 2020-03-16 | 1 | -0/+38 |
|\ \ \ | |||||
| * | | | prefix_path: show gitdir if worktree unavailable | Emily Shaffer | 2020-03-15 | 1 | -0/+38 |
* | | | | Merge branch 'en/rebase-backend' | Junio C Hamano | 2020-03-12 | 1 | -0/+8 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | sequencer: clear state upon dropping a become-empty commit | Elijah Newren | 2020-03-11 | 1 | -0/+8 |
* | | | | Merge branch 'ds/sparse-add' | Junio C Hamano | 2020-03-11 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | t1091: don't grep for `strerror()` string | Martin Ă…gren | 2020-03-09 | 1 | -1/+1 |
* | | | | | Merge branch 'hd/show-one-mergetag-fix' | Junio C Hamano | 2020-03-09 | 1 | -0/+20 |
|\ \ \ \ \ | |||||
| * | | | | | show_one_mergetag: print non-parent in hex form. | Harald van Dijk | 2020-03-02 | 1 | -0/+20 |
* | | | | | | Merge branch 'en/test-cleanup' | Junio C Hamano | 2020-03-09 | 9 | -677/+752 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | t6020: new test with interleaved lexicographic ordering of directories | Elijah Newren | 2020-02-27 | 1 | -0/+43 |
| * | | | | | t6022, t6046: test expected behavior instead of testing a proxy for it | Elijah Newren | 2020-02-27 | 2 | -34/+70 |
| * | | | | | t3035: prefer test_must_fail to bash negation for git commands | Elijah Newren | 2020-02-27 | 1 | -2/+2 |
| * | | | | | t6020, t6022, t6035: update merge tests to use test helper functions | Elijah Newren | 2020-02-27 | 3 | -47/+47 |
| * | | | | | t602[1236], t6034: modernize test formatting | Elijah Newren | 2020-02-27 | 5 | -595/+591 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'en/merge-path-collision' | Junio C Hamano | 2020-03-09 | 1 | -9/+30 |
|\ \ \ \ \ | |||||
| * | | | | | merge-recursive: apply collision handling unification to recursive case | Elijah Newren | 2020-02-27 | 1 | -9/+30 |
* | | | | | | Merge branch 'rj/t1050-use-test-path-is-file' | Junio C Hamano | 2020-03-09 | 1 | -4/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t1050: replace test -f with test_path_is_file | Rasmus Jonsson | 2020-02-24 | 1 | -4/+6 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'pb/am-show-current-patch' | Junio C Hamano | 2020-03-09 | 3 | -0/+40 |
|\ \ \ \ \ \ | |||||
| * | | | | | | am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch | Paolo Bonzini | 2020-02-20 | 1 | -0/+10 |
| * | | | | | | am: support --show-current-patch=raw as a synonym for--show-current-patch | Paolo Bonzini | 2020-02-20 | 1 | -0/+10 |
| * | | | | | | parse-options: add testcases for OPT_CMDMODE() | Paolo Bonzini | 2020-02-20 | 2 | -0/+20 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'am/pathspec-f-f-more' | Junio C Hamano | 2020-03-09 | 3 | -0/+184 |
|\ \ \ \ \ \ | |||||
| * | | | | | | stash push: support the --pathspec-from-file option | Alexandr Miloslavskiy | 2020-02-19 | 1 | -0/+100 |
| * | | | | | | stash: eliminate crude option parsing | Alexandr Miloslavskiy | 2020-02-19 | 1 | -0/+5 |
| * | | | | | | rm: support the --pathspec-from-file option | Alexandr Miloslavskiy | 2020-02-19 | 1 | -0/+79 |
| |/ / / / / | |||||
* | | | | | | t5537: adjust test_oid label | Johannes Schindelin | 2020-03-05 | 1 | -3/+3 |
* | | | | | | Merge branch 'js/ci-windows-update' | Junio C Hamano | 2020-03-05 | 8 | -59/+66 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t/lib-httpd: avoid using macOS' sed | Johannes Schindelin | 2020-02-27 | 8 | -59/+66 |
* | | | | | | | Merge branch 'be/describe-multiroot' | Junio C Hamano | 2020-03-05 | 1 | -0/+51 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | describe: don't abort too early when searching tags | Benno Evers | 2020-02-26 | 1 | -0/+51 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'es/recursive-single-branch-clone' | Junio C Hamano | 2020-03-05 | 1 | -1/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | clone: pass --single-branch during --recurse-submodules | Emily Shaffer | 2020-02-25 | 1 | -1/+12 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'es/do-not-let-rebase-switch-to-protected-branch' | Junio C Hamano | 2020-03-05 | 1 | -1/+19 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rebase: refuse to switch to branch already checked out elsewhere | Eric Sunshine | 2020-02-24 | 1 | -0/+18 |
| * | | | | | | | t3400: make test clean up after itself | Eric Sunshine | 2020-02-24 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'hv/receive-denycurrent-everywhere' | Junio C Hamano | 2020-03-05 | 3 | -1/+29 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t2402: test worktree path when called in .git directory | Hariom Verma | 2020-03-04 | 1 | -0/+6 |
| * | | | | | | | receive.denyCurrentBranch: respect all worktrees | Hariom Verma | 2020-02-24 | 2 | -0/+22 |
| * | | | | | | | t5509: use a bare repository for test push target | Hariom Verma | 2020-02-24 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'es/worktree-avoid-duplication-fix' | Junio C Hamano | 2020-03-05 | 1 | -0/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | worktree: don't allow "add" validation to be fooled by suffix matching | Eric Sunshine | 2020-02-24 | 1 | -0/+9 |
| |/ / / / / / |