aboutsummaryrefslogtreecommitdiff
path: root/t/t7110-reset-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-02-02 13:36:54 -0800
committerJunio C Hamano <gitster@pobox.com>2017-02-02 13:36:54 -0800
commit93d2387718b20b9b0784dce4a361c0b74ab632b7 (patch)
treee860ba41b67819b846eb7bcc8a945505fa5279e8 /t/t7110-reset-merge.sh
parent9dec2c652fdfebf8861b526405422088e7022bc0 (diff)
parentdf9ded4984ca9a2d8da9007049f4fb5275eaa3ac (diff)
downloadgit-93d2387718b20b9b0784dce4a361c0b74ab632b7.tar.gz
git-93d2387718b20b9b0784dce4a361c0b74ab632b7.tar.xz
Merge branch 'js/status-pre-rebase-i'
After starting "git rebase -i", which first opens the user's editor to edit the series of patches to apply, but before saving the contents of that file, "git status" failed to show the current state (i.e. you are in an interactive rebase session, but you have applied no steps yet) correctly. * js/status-pre-rebase-i: status: be prepared for not-yet-started interactive rebase
Diffstat (limited to 't/t7110-reset-merge.sh')
0 files changed, 0 insertions, 0 deletions