diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-01 14:31:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-01 14:31:18 -0700 |
| commit | a195230280e159899bd277641eb24efa7c6d1603 (patch) | |
| tree | 2b871f83080d996813ed0b6914fe3b88c35f6b08 /git-rebase.txt | |
| parent | 1b5a38274423dd3999d7f8d89c77c5a601686166 (diff) | |
| download | git-htmldocs-a195230280e159899bd277641eb24efa7c6d1603.tar.gz | |
Autogenerated HTML docs for v1.8.3.2-701-g8c4e4ec
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index c84854ae8..6b2e1c86a 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -389,7 +389,9 @@ squash/fixup series. the same ..., automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved - commit from `pick` to `squash` (or `fixup`). + commit from `pick` to `squash` (or `fixup`). Ignores subsequent + "fixup! " or "squash! " after the first, in case you referred to an + earlier fixup/squash with `git commit --fixup/--squash`. + This option is only valid when the '--interactive' option is used. + |