From: Junio C Hamano <junkio@cox.net>
To: git@vger.kernel.org
Subject: Re: Bad merging with stgit or git
Date: Tue, 21 Mar 2006 12:57:49 -0800 [thread overview]
Message-ID: <7vy7z3ecs2.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.64.0603211219230.3622@g5.osdl.org> (Linus Torvalds's message of "Tue, 21 Mar 2006 12:37:50 -0800 (PST)")
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".
prev parent reply other threads:[~2006-03-21 20:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-21 19:34 Bad merging with stgit or git Mauro Carvalho Chehab
2006-03-21 19:39 ` J. Bruce Fields
2006-03-21 20:18 ` Mauro Carvalho Chehab
2006-03-21 23:02 ` Junio C Hamano
2006-03-21 19:42 ` Linus Torvalds
2006-03-21 20:08 ` Petr Baudis
2006-03-21 20:37 ` Linus Torvalds
2006-03-21 20:57 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vy7z3ecs2.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).