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

Re: Bad merging with stgit or git

From
Junio C Hamano <junkio@cox.net>
Date
Mar 21, 2006, 20:57 UTC
Message-ID
<7vy7z3ecs2.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<Pine.LNX.4.64.0603211219230.3622@g5.osdl.org>
Linus Torvalds <torvalds@osdl.org> writes:
> And I _hope_ that no git that recent will commit a merge in progress. 
Not even 1.1 series for that matter, no.
Show 6 quoted lines
> However, it does look like the 
>
> 	case "$all,$also" in
> 	,t)
>
> case doesn't check for MERGE_HEAD. That could be the bug. Junio?
I do not think so.

"Also" (aka -i) means "run update-index for these paths for me first, and commit them alongside with what I (or merge) have already updated in the index".

Previous: Linus Torvalds
Message 8 of 8 in “Bad merging with stgit or git”
  1. Mauro Carvalho ChehabMar 21, 2006
  2. J. Bruce FieldsMar 21, 2006
  3. Mauro Carvalho ChehabMar 21, 2006
  4. Junio C HamanoMar 21, 2006
  5. Linus TorvaldsMar 21, 2006
  6. Petr BaudisMar 21, 2006
  7. Linus TorvaldsMar 21, 2006
  8. Junio C HamanoMar 21, 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.