Since 68d5d03 (rebase: teach --autosquash to match on sha1 in addition
to message, 2010-11-04) the commit subject can refer directly to the
destination object hash as a single word.)...
Signed-off-by: Philip Oakley <philipoak...@iee.org>
This is about the actual commit subject line, rather than the --fixup
options to the commit command.
This came out of
where I was expecting to be able to say 'fixup! <sha1> my message', but
I can't (which would be another day's patch - fixup! <rev>! my message').
One question is whether 'standalone' is clear enough, or needs to say
'single word revision'? (which would mean it's not 'object name')
Further, with more digging, I think that any
rev specifier that has no spaces should work , despite the 68d5d's
title. Though maybe during the relevant phase of rebase -i some of the
rev specifiers may not work because of the series being rewound - dunno.
Documentation/git-rebase.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 0387b40..66b789a 100644
@@ -421,7 +421,8 @@ without an explicit `--interactive`.
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
+ the same "..." message, or a commit object name (standalone),
+ 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
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