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

Re: What's cooking in git.git (topics)

From
Nicolas Pitre <nico@cam.org>
Date
Dec 30, 2006, 03:21 UTC
Message-ID
<Pine.LNX.4.64.0612292219280.18171@xanadu.home>
In-Reply-To
<Pine.LNX.4.63.0612291853210.19693@wbgn013.biozentrum.uni-wuerzburg.de>
On Fri, 29 Dec 2006, Johannes Schindelin wrote:
Show 14 quoted lines
> Hi,
> 
> On Thu, 28 Dec 2006, Junio C Hamano wrote:
> 
> > * jc/3way (Wed Nov 29 18:53:13 2006 -0800) 1 commit
> >  + git-merge: preserve and merge local changes when doing fast
> >    forward
> 
> I'd like this, but behind a command line switch. And in addition to saying 
> "cannot merge, blabla needs update", git could spit out "if you want to 
> risk a 3way merge, go ahead and add the --preserve-local flag to 
> git-merge".
> 
> Comments?
Is there really a point for not always doing it?

IOW, if you really want a command line switch, maybe it should be used to prevent the above not to allow it?

Nicolas
Previous: Junio C HamanoNext: Johannes Schindelin
Message 5 of 8 in “What's cooking in git.git (topics)”
  1. Junio C HamanoDec 29, 2006
  2. Johannes SchindelinDec 29, 2006
  3. Jakub NarebskiDec 29, 2006
  4. Junio C HamanoDec 29, 2006
  5. Nicolas PitreDec 30, 2006
  6. Johannes SchindelinDec 30, 2006
  7. Raimund BauerDec 30, 2006
  8. Johannes SchindelinDec 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.