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

Re: unmerging feature branches

From
Alejandro Martinez Ruiz <alex@flawedcode.org>
Date
Oct 31, 2007, 21:16 UTC
Message-ID
<20071031211658.GA5430@inspiron>
In-Reply-To
<alpine.LFD.0.999.0710231026011.30120@woody.linux-foundation.org>
On Tue 23 Oct 2007, 10:40, Linus Torvalds wrote:
Show 21 quoted lines
> 
> So a "revert" is fundamentally different from a "undo". Most of the time 
> 
> [cut]
> 
> So sometimes the behaviour of "git revert" will be exactly what people 
> expected and wanted ("good, I'll never get that commit again when I pull, 
> because I told git that I don't want that commit"), and sometimes it will 
> _not_ be what people expected and wanted ("oh, I didn't get that commit, 
> even though I was now ready for it - because I had reverted it back when I 
> was *not* ready for it").
> 
> See? The logic is exactly the same in both cases, but one was good, the 
> other bad, and the only difference was really the mindset of the user.
> 
> A tool can't ever get "mindset of the user" differences right. At least 
> not until we add the "esp option" ;)
> 
> So I really don't want to push this as a problem or deficiency, I think 
> it's a good thing. But it's a good thing only when people are *aware* of 
> what "revert" really means.

So how about an "undo" command or a switch for revert with a special meaning like "hey, this one is a nice commit, but it ain't ready yet, I'd like you to ignore I ever committed the thing when merging or rebasing again, thanks"?

Alex
Previous: Linus TorvaldsNext: martin f krafft
Message 11 of 16 in “unmerging feature branches”
  1. martin f krafftOct 23, 2007
  2. Matthieu MoyOct 23, 2007
  3. Linus TorvaldsOct 23, 2007
  4. martin f krafftOct 23, 2007
  5. Linus TorvaldsOct 23, 2007
  6. martin f krafftOct 23, 2007
  7. Linus TorvaldsOct 23, 2007
  8. martin f krafftOct 23, 2007
  9. Linus TorvaldsOct 23, 2007
  10. Linus TorvaldsOct 23, 2007
  11. Alejandro Martinez RuizOct 31, 2007
  12. martin f krafftOct 31, 2007
  13. Linus TorvaldsOct 31, 2007
  14. Junio C HamanoOct 23, 2007
  15. Linus TorvaldsOct 23, 2007
  16. revert/cherry-pick: work on merge commits as wellJunio C Hamano, Oct 23, 2007

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.