Re: [PATCH] rebase: convert revert to squash on autosquash
- From
- Michael S. Tsirkin <mst@redhat.com>
- Date
- Apr 8, 2016, 14:09 UTC
- Message-ID
- <20160408170809-mutt-send-email-mst@redhat.com>
- In-Reply-To
- <vpqtwjcnx7v.fsf@anie.imag.fr>
On Fri, Apr 08, 2016 at 01:42:12PM +0200, Matthieu Moy wrote:
Show 21 quoted lines
> 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.
Absolutely, but moving rebase to near the commit to drop also makes it easier to spot where the commit is. Thoughts?
> -- > Matthieu Moy > http://www-verimag.imag.fr/~moy/