diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-02-25 16:43:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-25 16:43:31 -0800 |
| commit | 682bbad64d9afd438d9b293c18331c1018672fee (patch) | |
| tree | 688ed7a3c73bfee2f8b5e9b68466c8a2e5331991 /builtin/merge-file.c | |
| parent | Merge branch 'mt/grep-sparse-checkout' (diff) | |
| parent | rebase: add a config option for --no-fork-point (diff) | |
| download | tgif-682bbad64d9afd438d9b293c18331c1018672fee.tar.xz | |
Merge branch 'ah/rebase-no-fork-point-config'
"git rebase --[no-]fork-point" gained a configuration variable
rebase.forkPoint so that users do not have to keep specifying a
non-default setting.
* ah/rebase-no-fork-point-config:
rebase: add a config option for --no-fork-point
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions