From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: "Michael S. Tsirkin" <mst@redhat.com>, git@vger.kernel.org
Subject: Re: [PATCH] rebase: convert revert to squash on autosquash
Date: Fri, 08 Apr 2016 13:42:12 +0200 [thread overview]
Message-ID: <vpqtwjcnx7v.fsf@anie.imag.fr> (raw)
In-Reply-To: <alpine.DEB.2.20.1604081309150.2967@virtualbox> (Johannes Schindelin's message of "Fri, 8 Apr 2016 13:13:51 +0200 (CEST)")
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/
next prev parent reply other threads:[~2016-04-08 11:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-07 15:12 [PATCH] rebase: convert revert to squash on autosquash Michael S. Tsirkin
2016-04-07 15:23 ` Johannes Schindelin
2016-04-07 15:51 ` Michael S. Tsirkin
2016-04-08 11:13 ` Johannes Schindelin
2016-04-08 11:42 ` Matthieu Moy [this message]
2016-04-08 14:09 ` Michael S. Tsirkin
2016-04-08 11:43 ` Michael S. Tsirkin
2016-04-09 17:17 ` Michael S. Tsirkin
2016-04-08 11:39 ` Matthieu Moy
-- strict thread matches above, loose matches on Subject: below --
2014-10-22 6:57 Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vpqtwjcnx7v.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=mst@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.