diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-05-07 12:47:40 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-07 12:47:40 +0900 |
| commit | 0377ac98dcf797d4711d2f0757ce49171ee4bb04 (patch) | |
| tree | eeac49d28b994b1b897fb54216022d4d400d4fcb /mergetools/tortoisemerge | |
| parent | Merge branch 'ab/doc-lint' (diff) | |
| parent | rebase: don't override --no-reschedule-failed-exec with config (diff) | |
| download | tgif-0377ac98dcf797d4711d2f0757ce49171ee4bb04.tar.xz | |
Merge branch 'ab/rebase-no-reschedule-failed-exec'
"git rebase --[no-]reschedule-failed-exec" did not work well with
its configuration variable, which has been corrected.
* ab/rebase-no-reschedule-failed-exec:
rebase: don't override --no-reschedule-failed-exec with config
rebase tests: camel-case rebase.rescheduleFailedExec consistently
Diffstat (limited to 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions