summaryrefslogtreecommitdiff
path: root/t/t7602-merge-octopus-many.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-07-29 12:38:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-07-29 12:38:18 -0700
commit8eb5097bea042205810781d786a8eb7abd2962a9 (patch)
tree15b8115a7c9b0ccd2b7a3b3495bfa13c27647c75 /t/t7602-merge-octopus-many.sh
parentMerge branch 'qn/clone-doc-use-long-form' into maint (diff)
parentrebase --am: ignore rebase.rescheduleFailedExec (diff)
downloadtgif-8eb5097bea042205810781d786a8eb7abd2962a9.tar.xz
Merge branch 'js/rebase-reschedule-applies-only-to-interactive' into maint
The configuration variable rebase.rescheduleFailedExec should be effective only while running an interactive rebase and should not affect anything when running an non-interactive one, which was not the case. This has been corrected. * js/rebase-reschedule-applies-only-to-interactive: rebase --am: ignore rebase.rescheduleFailedExec
Diffstat (limited to 't/t7602-merge-octopus-many.sh')
0 files changed, 0 insertions, 0 deletions