diff options
| author | Elijah Newren <newren@gmail.com> | 2020-02-15 21:36:39 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-16 15:40:42 -0800 |
| commit | 8295ed690bf1d458f80cffdc17d663eb3ba5162a (patch) | |
| tree | 5ea6c29352d37379d8a287a65c7fce79493473b0 /Documentation | |
| parent | 76340c8107ba8e658f9cc76d1d220bac2944d1f1 (diff) | |
| download | git-8295ed690bf1d458f80cffdc17d663eb3ba5162a.tar.gz | |
rebase: make the backend configurable via config setting
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/rebase.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/config/rebase.txt b/Documentation/config/rebase.txt index d98e32d812..e6ae30c999 100644 --- a/Documentation/config/rebase.txt +++ b/Documentation/config/rebase.txt @@ -5,6 +5,14 @@ rebase.useBuiltin:: is always used. Setting this will emit a warning, to alert any remaining users that setting this now does nothing. +rebase.backend:: + Default backend to use for rebasing. Possible choices are + 'am' or 'merge' (note that the merge backend is sometimes also + refered to as the interactive backend or the interactive + machinery elsewhere in the docs). Also, in the future, if the + merge backend gains all remaining capabilities of the am + backend, this setting may become unused. + rebase.stat:: Whether to show a diffstat of what changed upstream since the last rebase. False by default. |