[PATCH v1 2/3] doc: rebase: fixup! can take an object name
- From
Philip Oakley <philipoakley@iee.org>
- Date
- Aug 14, 2016, 21:46 UTC
- Message-ID
- <20160814214630.1312-3-philipoakley@iee.org>
- In-Reply-To
- <20160814214630.1312-1-philipoakley@iee.org>
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 <philipoakley@iee.org> --- v1 This is about the actual commit subject line, rather than the --fixup options to the commit command.
This came out of https://public-inbox.org/git/FAE9116880074D6FA421942CCAEC368F@PhilipOakley/ 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 [1], 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.
[1] https://github.com/git/git/blame/v2.9.2/git-rebase--interactive.sh#L790 --- 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 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -421,7 +421,8 @@ without an explicit `--interactive`. --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 + 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
-- 2.9.0.windows.1