summaryrefslogtreecommitdiffstats
path: root/git-rebase.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-03-05 10:15:36 -0800
committerJunio C Hamano <gitster@pobox.com>2024-03-05 10:15:36 -0800
commite13743909da808044f9ce2250fa7d449c991ecb2 (patch)
tree49236c7d0c7bd73f79da3dfbabd490f8b0d69f8a /git-rebase.txt
parentff921867bef0a1b24753e19e4be0cf824eca22bf (diff)
downloadgit-htmldocs-e13743909da808044f9ce2250fa7d449c991ecb2.tar.gz
Autogenerated HTML docs for v2.44.0-117-g43072b
Diffstat (limited to 'git-rebase.txt')
-rw-r--r--git-rebase.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.txt b/git-rebase.txt
index 06206521f..e7e725044 100644
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -607,7 +607,7 @@ The recommended way to create commits with squash markers is by using the
linkgit:git-commit[1], which take the target commit as an argument and
automatically fill in the subject line of the new commit from that.
+
-Settting configuration variable `rebase.autoSquash` to true enables
+Setting configuration variable `rebase.autoSquash` to true enables
auto-squashing by default for interactive rebase. The `--no-autosquash`
option can be used to override that setting.
+