Re: [PATCH v1 2/3] doc: rebase: fixup! can take an object name

From: Philip Oakley <philipoakley@iee.org>
Date: Aug 14, 2016, 23:00 UTC
Message-ID: <BF74616BD9694719A6C0D6E75ACD9CE6@PhilipOakley>
In-Reply-To: <xmqqziofj90b.fsf@gitster.mtv.corp.google.com>

From: "Junio C Hamano" <gitster@pobox.com>

Show 8 quoted lines

> Philip Oakley <philipoakley@iee.org> 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 ;-).

As noted in 1/3, the glossary also needs a fix (for those who read it) to make sure the name-value confusion is distinguished, with the potential 'object names' (colloquial) being via (git) 'revisions', while the cannonical object name is the (oid) sha1 hash. Somehow folk need pointing at the (broad) ways of spelling commit names rather than just the narrow sha. A bit of a finger and the moon problem.

Show 15 quoted lines

>
>> 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.

the 'standalone' is that it must be a single (standalone) word on the subject line immediately after the "fixup! "(s).

communicationg that one cannot have any extra textual notes after that word was the issue that 'standalone' tried to address.

-- Philip