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

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

From
RBRaimund Bauer <ray007@gmx.net>
Date
Dec 30, 2006, 12:24 UTC
Message-ID
<45965A82.8030903@gmx.net>
In-Reply-To
<Pine.LNX.4.63.0612301217010.19693@wbgn013.biozentrum.uni-wuerzburg.de>
* Johannes Schindelin wrote, On 30.12.2006 12:22:
> (Of course, the correct thing would not be "git reset --hard", but rather 
> "git diff --ours | git apply -R; git reset", but that's a tad long, no?)
Then maybe introduce "git reset --ours" which does exactly that?
-- 
best regards

  Ray
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 7 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.