git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] rebase: convert revert to squash on autosquash

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Apr 8, 2016, 11:42 UTC
Message-ID
<vpqtwjcnx7v.fsf@anie.imag.fr>
In-Reply-To
<alpine.DEB.2.20.1604081309150.2967@virtualbox>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
Show 11 quoted lines
> 	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/
Previous: Johannes SchindelinNext: Michael S. Tsirkin
Message 5 of 9 in “rebase: convert revert to squash on autosquash”
  1. rebase: convert revert to squash on autosquashMichael S. Tsirkin, Apr 7, 2016
  2. Johannes SchindelinApr 7, 2016
  3. Michael S. TsirkinApr 7, 2016
  4. Johannes SchindelinApr 8, 2016
  5. Matthieu MoyApr 8, 2016
  6. Michael S. TsirkinApr 8, 2016
  7. Michael S. TsirkinApr 8, 2016
  8. Michael S. TsirkinApr 9, 2016
  9. Matthieu MoyApr 8, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.