aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/config/rebase.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/config/rebase.txt')
-rw-r--r--Documentation/config/rebase.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/config/rebase.txt b/Documentation/config/rebase.txt
index 7c57c5ee80..c6187ab28b 100644
--- a/Documentation/config/rebase.txt
+++ b/Documentation/config/rebase.txt
@@ -9,7 +9,9 @@ rebase.stat::
rebase. False by default.
rebase.autoSquash::
- If set to true enable `--autosquash` option by default.
+ If set to true, enable the `--autosquash` option of
+ linkgit:git-rebase[1] by default for interactive mode.
+ This can be overridden with the `--no-autosquash` option.
rebase.autoStash::
When set to true, automatically create a temporary stash entry