diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-04-16 11:18:41 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-04-17 11:31:37 +0900 |
| commit | b07d9bfd171d881a02d110b68673c58cb63e9f62 (patch) | |
| tree | 50cb587f5e0e614a0892c2d46998c05d21a44f86 /t/t5515/fetch.br-config-explicit-merge_config-explicit | |
| parent | mingw: allow building with an MSYS2 runtime v3.x (diff) | |
| download | tgif-b07d9bfd171d881a02d110b68673c58cb63e9f62.tar.xz | |
commit/reset: try to clean up sequencer state
When cherry-picking or reverting a sequence of commits and if the final
pick/revert has conflicts and the user uses `git commit` to commit the
conflict resolution and does not run `git cherry-pick --continue` then
the sequencer state is left behind. This can cause problems later. In my
case I cherry-picked a sequence of commits the last one of which I
committed with `git commit` after resolving some conflicts, then a while
later, on a different branch I aborted a revert which rewound my HEAD to
the end of the cherry-pick sequence on the previous branch. Avoid this
potential problem by removing the sequencer state if we're committing or
resetting the final pick in a sequence.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515/fetch.br-config-explicit-merge_config-explicit')
0 files changed, 0 insertions, 0 deletions