Re: Feature request: Configurable prefixes for git commit --fixup and --squash

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Mar 3, 2016, 15:59 UTC
Message-ID: <vpq1t7rlfi1.fsf@anie.imag.fr>
In-Reply-To: <CALHmdRwgDjRJMQSPzp34aS25ZHg-mr458QeyYgyp85q8g34Aig@mail.gmail.com>

Martine Lenders <mlenders@riot-os.org> writes:

Show 5 quoted lines

> Hi John,
> yes, it can be anywhere in the commit message and I already thought
> about using a hook for generating the commit message too, but the
> problem is then, that `git rebase` won't pair up the commit for
> squashing/fixing up with the original commit.

It won't match if you put it in the subject line, but John's proposal is to put it at the bottom (i.e. in the body). This won't disturb "git rebase --autosquash".

> Maybe another approach could be to allow for a configuration of a
> string that is ignored when matching the commit messages in `git
> rebase`.

I wish I could write commit messages like

fixup! deadbeef: fix typo (foo -> bar)

So that the commit message contains both the instruction for "rebase --autosquash" and a quick explanation of what the commit is doing (as usual commit messages).

AFAIK, it's not possible currently but shouldn't be hard to implement.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/