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

Re: Please undo "Use git-merge instead of git-resolve in git-pull"

From
Linus Torvalds <torvalds@osdl.org>
Date
Sep 21, 2005, 22:03 UTC
Message-ID
<Pine.LNX.4.58.0509211501130.2553@g5.osdl.org>
In-Reply-To
<7vu0genlc1.fsf@assigned-by-dhcp.cox.net>
On Wed, 21 Sep 2005, Junio C Hamano wrote:
> 
> * I thought you do not multitask and wonder why you are merging
>   while you still have local changes, but that does not justify
>   this regression.

I've always multi-tasked, but when I started git I was ready to drop it. Then I came up with that wonderful "merge in the index" approach, and I could do it again, and I was _soo_ happy.

I often have local changes in my tree that I don't want to commit but that I'm testing out. Havign them interfere with merging other peoples work would mean that I'd have to have a totally separate tree for that, which I could do, but I'm much much happier not having to.

		Linus
Previous: Junio C HamanoNext: David S. Miller
Message 4 of 10 in “Please undo "Use git-merge instead of git-resolve in git-pull"”
  1. Linus TorvaldsSep 21, 2005
  2. Linus TorvaldsSep 21, 2005
  3. Junio C HamanoSep 21, 2005
  4. Linus TorvaldsSep 21, 2005
  5. David S. MillerSep 22, 2005
  6. Linus TorvaldsSep 22, 2005
  7. Olivier GalibertSep 22, 2005
  8. Martin LanghoffSep 22, 2005
  9. Linus TorvaldsSep 22, 2005
  10. Petr BaudisSep 23, 2005

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.