diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-09-01 18:43:07 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-09-01 18:43:07 +0000 |
| commit | 075ae872e449692eeaa3f3b5446298382a49aa23 (patch) | |
| tree | adf6ef2afdf0747adaf4c97e5ade0085ea7148f3 /git-rebase.txt | |
| parent | de9745c4705d1abe0983cf9aba9af20936c18eb5 (diff) | |
| download | git-htmldocs-075ae872e449692eeaa3f3b5446298382a49aa23.tar.gz | |
Autogenerated HTML docs for v1.7.2.2-268-g7e423
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 3b87f1a1b..45c52d2e5 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -199,6 +199,9 @@ rebase.stat:: Whether to show a diffstat of what changed upstream since the last rebase. False by default. +rebase.autosquash:: + If set to true enable '--autosquash' option by default. + OPTIONS ------- <newbase>:: @@ -333,6 +336,7 @@ idea unless you know what you are doing (see BUGS below). instead. --autosquash:: +--no-autosquash:: When the commit log message begins with "squash! ..." (or "fixup! ..."), and there is a commit whose title begins with the same ..., automatically modify the todo list of rebase -i @@ -341,6 +345,10 @@ idea unless you know what you are doing (see BUGS below). commit from `pick` to `squash` (or `fixup`). + This option is only valid when the '--interactive' option is used. ++ +If the '--autosquash' option is enabled by default using the +configuration variable `rebase.autosquash`, this option can be +used to override and disable this setting. --no-ff:: With --interactive, cherry-pick all rebased commits instead of |