Merge branch 'js/rebase-i-redo-exec'
authorJunio C Hamano <gitster@pobox.com>
Tue, 29 Jan 2019 20:47:53 +0000 (12:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Jan 2019 20:47:53 +0000 (12:47 -0800)
"git rebase -i" learned to re-execute a command given with 'exec'
to run after it failed the last time.

* js/rebase-i-redo-exec:
rebase: introduce a shortcut for --reschedule-failed-exec
rebase: add a config option to default to --reschedule-failed-exec
rebase: introduce --reschedule-failed-exec

1  2 
Documentation/git-rebase.txt
builtin/rebase--interactive.c
builtin/rebase.c
sequencer.c
sequencer.h
Simple merge
Simple merge
Simple merge
diff --cc sequencer.c
Simple merge
diff --cc sequencer.h
Simple merge