diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-26 03:43:31 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-26 03:43:31 +0300 |
| commit | 682bbad64d9afd438d9b293c18331c1018672fee (patch) | |
| tree | 688ed7a3c73bfee2f8b5e9b68466c8a2e5331991 /Documentation | |
| parent | 628c13cceed408526df39dbbd4a0d00bc4f34803 (diff) | |
| parent | 2803d800d2268cde4b932fab38dffe6712d86d16 (diff) | |
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 'Documentation')
| -rw-r--r-- | Documentation/config/rebase.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/config/rebase.txt b/Documentation/config/rebase.txt index 7f7a07d22f..214f31b451 100644 --- a/Documentation/config/rebase.txt +++ b/Documentation/config/rebase.txt @@ -68,3 +68,6 @@ rebase.rescheduleFailedExec:: Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided). This is the same as specifying the `--reschedule-failed-exec` option. + +rebase.forkPoint:: + If set to false set `--no-fork-point` option by default. |