From: Junio C Hamano <junkio@cox.net>
Date: Tue, 21 Mar 2006 20:57:49 GMT
Subject: Re: Bad merging with stgit or git
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.

> 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".