diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-02-08 20:44:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-08 20:44:52 -0800 |
| commit | b966813e716504252ea26a635db21aa628e3dbd8 (patch) | |
| tree | 9e1164f754db4e0b9b793d7cd79eb4d285279e5f /merge-recursive.c | |
| parent | Merge branch 'nd/checkout-noisy-unmerge' (diff) | |
| parent | Revert "rebase: introduce a shortcut for --reschedule-failed-exec" (diff) | |
| download | tgif-b966813e716504252ea26a635db21aa628e3dbd8.tar.xz | |
Merge branch 'js/rebase-i-redo-exec-fix'
For "rebase -i --reschedule-failed-exec", we do not want the "-y"
shortcut after all.
* js/rebase-i-redo-exec-fix:
Revert "rebase: introduce a shortcut for --reschedule-failed-exec"
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions