diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-07-01 12:41:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-01 12:41:52 -0700 |
| commit | eb3a4fc149d1a0d604ea6abf9085b3acfe3e85e6 (patch) | |
| tree | c2cea01d268485d0054dc11e00869e4cc4ce898a /Documentation | |
| parent | Merge branch 'kb/am-deprecate-resolved' (diff) | |
| parent | lib-rebase: style: use write_script, <<-\EOF (diff) | |
| download | tgif-eb3a4fc149d1a0d604ea6abf9085b3acfe3e85e6.tar.xz | |
Merge branch 'ap/rebase-multiple-fixups'
Having multiple "fixup!" on a line in the rebase instruction sheet
did not work very well with "git rebase -i --autosquash".
* ap/rebase-multiple-fixups:
lib-rebase: style: use write_script, <<-\EOF
rebase -i: handle fixup! fixup! in --autosquash
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index c84854ae87..6b2e1c86ab 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/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. + |