From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Fri, 08 Apr 2016 11:42:12 GMT
Subject: Re: [PATCH] rebase: convert revert to squash on autosquash
Message-ID: <vpqtwjcnx7v.fsf@anie.imag.fr>
In-Reply-To: <alpine.DEB.2.20.1604081309150.2967@virtualbox>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> 	git revert -n deadbeef
> 	git commit --squash deadbeef
>
> where "deadbeef" is the placeholder for the actual commit to revert.
>
> And indeed, I use exactly this song and dance quite frequently, *iff* my
> intention is to drop a patch.
>
> A much better idea than co-opting the "Revert" commit message would be to
> introduce a sibling to --fixup and --squash that you could call
> --drop.

One could also add --fixup and --squash to "git revert", so the above
would become

    git revert --squash deadbeef

In most cases, I find it simpler to just start a rebase -i and drop the
commit from rebase's todo-list.

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