diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-04-04 14:28:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-04 14:28:28 -0700 |
| commit | 9142fce9b09dbc12cd99704d3ea0899efb350c39 (patch) | |
| tree | 370ffc7181d89310d9fd9154eee50965ae85dd36 /Documentation/config | |
| parent | 7e13d654c23fd02e3e777754b379b03521833d7c (diff) | |
| parent | 6605fb70cb79776af9e20c0300dc66563a300b42 (diff) | |
| download | git-9142fce9b09dbc12cd99704d3ea0899efb350c39.tar.gz | |
Merge branch 'ah/rebase-merges-config'
Streamline --rebase-merges command line option handling and
introduce rebase.merges configuration variable.
* ah/rebase-merges-config:
rebase: add a config option for --rebase-merges
rebase: deprecate --rebase-merges=""
rebase: add documentation and test for --no-rebase-merges
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/rebase.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/config/rebase.txt b/Documentation/config/rebase.txt index f19bd0e040..afaf6dad99 100644 --- a/Documentation/config/rebase.txt +++ b/Documentation/config/rebase.txt @@ -67,3 +67,13 @@ rebase.rescheduleFailedExec:: rebase.forkPoint:: If set to false set `--no-fork-point` option by default. + +rebase.rebaseMerges:: + Whether and how to set the `--rebase-merges` option by default. Can + be `rebase-cousins`, `no-rebase-cousins`, or a boolean. Setting to + true or to `no-rebase-cousins` is equivalent to + `--rebase-merges=no-rebase-cousins`, setting to `rebase-cousins` is + equivalent to `--rebase-merges=rebase-cousins`, and setting to false is + equivalent to `--no-rebase-merges`. Passing `--rebase-merges` on the + command line, with or without an argument, overrides any + `rebase.rebaseMerges` configuration. |