22c5b13 (rebase -i: handle fixup! fixup! in --autosquash, 2013-06-27)
Signed-off-by: Philip Oakley <philipoak...@iee.org>
the historical discussion about this is here
I certainly misunderstood what this meant. It sounded like only one fixup! was
allowed per commit (i.e. one mistake) - fixing two mistakes wouldn't be
allowed. Hindsight is a wonderful thing.
Also, does 'earliest commit requiring fixup/squash' fully convey that
its the one to fix.
Documentation/git-rebase.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 66b789a..91eb107 100644
@@ -425,9 +425,9 @@ without an explicit `--interactive`.
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`). Ignores subsequent
- "fixup! " or "squash! " after the first, in case you referred to an
- earlier fixup/squash with `git commit --fixup/--squash`.
+ commit from `pick` to `squash` (or `fixup`). Commits with repeated
+ "fixup! " or "squash! " in the subject line are considered to refer
+ to the earliest commit requiring fixup/squash.
This option is only valid when the '--interactive' option is used.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html