diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-04-16 11:18:42 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-04-17 11:31:39 +0900 |
| commit | 4a72486de97b5c6b0979b2b51e50c268bdb0d4f6 (patch) | |
| tree | 59f14e26ef0542b206a0e991f0a9ac7a582f466a /.mailmap | |
| parent | commit/reset: try to clean up sequencer state (diff) | |
| download | tgif-4a72486de97b5c6b0979b2b51e50c268bdb0d4f6.tar.xz | |
fix cherry-pick/revert status after commit
If the user commits a conflict resolution using `git commit` in the
middle of a sequence of cherry-picks/reverts then `git status` missed
the fact that a cherry-pick/revert is still in progress.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions