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

Re: why is merging with unstaged changes allowed when rebasing is not?

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 4, 2011, 17:53 UTC
Message-ID
<7vmxla7oxl.fsf@alter.siamese.dyndns.org>
In-Reply-To
<AANLkTi=dnyaPTX0Y43nbAGp46NtscKT3a2idxEhkreMm@mail.gmail.com>
Christian Halstrick <christian.halstrick@gmail.com> writes:
> Isn't it inconsistent that I can merge with unstaged changes in my
> work-tree but not rebase?

Because people who wrote rebase didn't bother; it is too cumbersome to check all the possibly affected paths beforehand while replaying multiple changes.

Patches welcome ;-).
Previous: Christian HalstrickNext: Neal Kreitzinger
Message 2 of 3 in “why is merging with unstaged changes allowed when rebasing is not?”
  1. Christian HalstrickMar 4, 2011
  2. Junio C HamanoMar 4, 2011
  3. Neal KreitzingerMar 7, 2011

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.