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

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

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Dec 31, 2006, 15:04 UTC
Message-ID
<Pine.LNX.4.63.0612311602160.22628@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<7vhcvcfpze.fsf@assigned-by-dhcp.cox.net>
Hi,
On Sun, 31 Dec 2006, Junio C Hamano wrote:
Show 8 quoted lines
> * jc/3way (Wed Nov 29 18:53:13 2006 -0800) 1 commit
>  + git-merge: preserve and merge local changes when doing fast
>    forward
> 
> A few people wanted to have this in v1.5.0, but I am a bit reluctant to 
> do so --- I think the behaviour of its failure mode is rather nasty, 
> even though it tries to help the user by dropping the local diff in 
> .git/LOCAL_DIFF file.

I am not urging the inclusion in 1.5.0, but how about storing not the diff, but the _state_ in .git/UNCOMMITTED_TREE? This would work with all the git tools without any problem, and git-gc would eventually clean up older intermediate stages.

Ciao, Dscho

Previous: Juergen RuehleNext: Shawn O. Pearce
Message 3 of 4 in “What's cooking in git.git (topics)”
  1. Junio C HamanoDec 31, 2006
  2. Juergen RuehleDec 31, 2006
  3. Johannes SchindelinDec 31, 2006
  4. Shawn O. PearceJan 1, 2007

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.