diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-04-16 10:18:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-17 02:31:39 (GMT) |
| commit | 4a72486de97b5c6b0979b2b51e50c268bdb0d4f6 (patch) | |
| tree | 59f14e26ef0542b206a0e991f0a9ac7a582f466a /t/t1305-config-include.sh | |
| parent | b07d9bfd171d881a02d110b68673c58cb63e9f62 (diff) | |
| download | git-4a72486de97b5c6b0979b2b51e50c268bdb0d4f6.zip git-4a72486de97b5c6b0979b2b51e50c268bdb0d4f6.tar.gz git-4a72486de97b5c6b0979b2b51e50c268bdb0d4f6.tar.bz2 | |
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 't/t1305-config-include.sh')
0 files changed, 0 insertions, 0 deletions