diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-25 20:57:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-25 20:57:43 (GMT) |
| commit | f085189f145d1092b43223b72992e851fb412895 (patch) | |
| tree | d68301794c56e93d4ab61f40b8397ed8a1a7b8ef /notes-cache.c | |
| parent | 9a0fa1709c188d8be05aa573fa914d115f55aab1 (diff) | |
| parent | 430b75f7209c554d88e3554eb54cebf4ba1e4608 (diff) | |
| download | git-f085189f145d1092b43223b72992e851fb412895.zip git-f085189f145d1092b43223b72992e851fb412895.tar.gz git-f085189f145d1092b43223b72992e851fb412895.tar.bz2 | |
Merge branch 'pw/advise-rebase-skip'
The mechanism to prevent "git commit" from making an empty commit
or amending during an interrupted cherry-pick was broken during the
rewrite of "git rebase" in C, which has been corrected.
* pw/advise-rebase-skip:
commit: give correct advice for empty commit during a rebase
commit: encapsulate determine_whence() for sequencer
commit: use enum value for multiple cherry-picks
sequencer: write CHERRY_PICK_HEAD for reword and edit
cherry-pick: check commit error messages
cherry-pick: add test for `--skip` advice in `git commit`
t3404: use test_cmp_rev
Diffstat (limited to 'notes-cache.c')
0 files changed, 0 insertions, 0 deletions