summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2018-12-10 11:04:59 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-12-11 17:19:01 +0900
commit969de3ff0e01282cc061892f47b5f04b22de76af (patch)
tree7cb57f640d3a3dfa681969c0d837607623dd7232 /builtin/merge-file.c
parentrebase: introduce --reschedule-failed-exec (diff)
downloadtgif-969de3ff0e01282cc061892f47b5f04b22de76af.tar.xz
rebase: add a config option to default to --reschedule-failed-exec
It would be cumbersome to type out that option all the time, so let's offer the convenience of a config setting: rebase.rescheduleFailedExec. Besides, this opens the door to changing the default in a future version of Git: it does make some sense to reschedule failed `exec` commands by default (and if we could go back in time when the `exec` command was invented, we probably would change that default right from the start). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions