Linus Torvalds <torvalds@xxxxxxxx> 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". - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html