Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors
- From
Philip Oakley <philipoakley@iee.org>
- Date
- Aug 6, 2016, 17:45 UTC
- Message-ID
- <996096FBF9464263A35A5AEDED7F34EF@PhilipOakley>
- In-Reply-To
- <alpine.DEB.2.20.1608061036270.5786@virtualbox>
From: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Show 11 quoted lines
> Hi Philip, > > On Fri, 5 Aug 2016, Philip Oakley wrote: > >> In the same vein, I always want,with my workflow, to use "fixup! >> <short_sha1>". > > Good news for you: this is already supported. See here: > > https://github.com/git/git/blob/v2.9.2/git-rebase--interactive.sh#L786-L796 >
That's odd <knowing look>, I never saw any of that in the documentation...
Blame says it was 68d5d03 (rebase: teach --autosquash to match on sha1 in addition to message, 2010-11-04) which was before I discovered Git. Maybe another documentation fixup needed ;-)
Mind you I'm not sure about 22c5b13 (rebase -i: handle fixup! fixup! in --autosquash, 2013-06-27) which looks to only allow one fixup, but maybe I'm misreading. [e.g. recieve multiple fixups from the list, or need extra fixups as code of documentation is tested]
The capability is still good to know.
Philip