From: Junio C Hamano Date: Sun, 14 Aug 2016 22:11:48 GMT Subject: Re: [PATCH v1 2/3] doc: rebase: fixup! can take an object name Message-ID: In-Reply-To: <20160814214630.1312-3-philipoakley@iee.org> Philip Oakley writes: > 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.)... That's not an object hash but an object name (see glossary); you got it right in the actual patch text, though ;-). > 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 What's "(standalone)"? I can understand the updated text and agree that it is better than the original without that part, though. > 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