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

Re: Wine + GIT

From
Llinux@horizon.com <linux@horizon.com>
Date
Dec 8, 2005, 07:30 UTC
Message-ID
<20051208073000.7097.qmail@science.horizon.com>
Show 5 quoted lines
> The paragraph "Once you have finished editting [sic]..." needs
> to be followed by:
> 
>	git-update-index those paths you hand corrected
>        git-commit

This is what happens when you have people too used to using the pre-porcelain plumbing.

How about just git-commit <the paths you hand corrected>

If you forget any, the commit will fail, but they will have been updated in the index, and you don't need to mention them again in the next attempt.

(Grump... I just noticed that the "recursive" merge stratgy *doesn't* generate a merged file containing conflict markers, at least not in the case I tried. Instead I get "a~HEAD" and "a~branch" files. Time to fix the docs...)

Next: Fredrik Kuivinen
Message 1 of 3 in “Re: Wine + GIT”
  1. linux@horizon.comDec 8, 2005
  2. Fredrik KuivinenDec 8, 2005
  3. Junio C HamanoDec 8, 2005

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.