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

Re: [PATCH] git-merge: preserve and merge local changes when doing fast forward

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Nov 30, 2006, 10:32 UTC
Message-ID
<Pine.LNX.4.63.0611301129410.30004@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<7v1wnlmyba.fsf@assigned-by-dhcp.cox.net>
Hi,
On Wed, 29 Nov 2006, Junio C Hamano wrote:
> Perhaps we would want a new option to git-merge to allow preserving the 
> local changes, but the obvious candidate -m is taken for something else 
> per recent popular request X-<...

How about "-k|--keep-changes" or "-l|--local-changes", or "-p|--preserve-changes"?

BTW from a user's perspective, this operation _is_ a merge, not a checkout. So, IMHO the compatibility with that rarely used option of git-checkout is neglectable.

Ciao,
Previous: Carl Worth
Message 3 of 3 in “git-merge: preserve and merge local changes when doing fast forward”
  1. git-merge: preserve and merge local changes when doing fast forwardJunio C Hamano, Nov 30, 2006
  2. Carl WorthNov 30, 2006
  3. Johannes SchindelinNov 30, 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.