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

Re: Effective difference between git-rebase and git-resolve

From
Junio C Hamano <junkio@cox.net>
Date
Mar 25, 2006, 06:10 UTC
Message-ID
<7v1wwrys07.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20060325043507.GA14644@buici.com>
Marc Singer <elf@buici.com> writes:
Show 6 quoted lines
>> 	git merge "Merge with Linus" work linus
>> 
>> instead, which will use the proper "recursive" merge functionality.
>
> OK.  I'll see if that is more successful.  It would be nice if the
> resolve command printed a message about the command being deprecated.

The only reason I didn't do that was because I just did not want to disrupt the workflow by Linus. If nobody in the upper echelon of kernel people (meaning, longest-time git users) use git-resolve anymore, I think we should mark it deprecated and remove it eventually.

Previous: J. Bruce FieldsNext: Johannes Schindelin
Message 7 of 10 in “Effective difference between git-rebase and git-resolve”
  1. Marc SingerMar 25, 2006
  2. Linus TorvaldsMar 25, 2006
  3. Junio C HamanoMar 25, 2006
  4. Marc SingerMar 25, 2006
  5. Junio C HamanoMar 25, 2006
  6. J. Bruce FieldsMar 26, 2006
  7. Junio C HamanoMar 25, 2006
  8. Johannes SchindelinMar 25, 2006
  9. Mark WoodingMar 25, 2006
  10. Johannes SchindelinMar 25, 2006

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.