diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-03-05 09:44:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-05 09:44:44 -0800 |
| commit | 53ac1f106f4fbc3f23bdcc7847a49e69e93f66e4 (patch) | |
| tree | 5ba9a0b610882315b612f557da7ad2665a8901b8 /Documentation/git-rebase.txt | |
| parent | d037212d973351ced4a3f0bb0705575bee4f8566 (diff) | |
| parent | 40b8076462b9f977a88d21609d8f1c99d0d2ca33 (diff) | |
| download | git-53ac1f106f4fbc3f23bdcc7847a49e69e93f66e4.tar.gz | |
Merge branch 'ak/rebase-autosquash'
Typofix.
* ak/rebase-autosquash:
rebase: fix typo in autosquash documentation
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 06206521fc..e7e725044d 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/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. + |