diff options
Diffstat (limited to 'Documentation/config/rebase.txt')
| -rw-r--r-- | Documentation/config/rebase.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Documentation/config/rebase.txt b/Documentation/config/rebase.txt index e6ae30c..7f7a07d 100644 --- a/Documentation/config/rebase.txt +++ b/Documentation/config/rebase.txt @@ -7,11 +7,9 @@ rebase.useBuiltin:: 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. + 'apply' or 'merge'. In the future, if the merge backend gains + all remaining capabilities of the apply backend, this setting + may become unused. rebase.stat:: Whether to show a diffstat of what changed upstream since the last |