From: "Martin Langhoff (CatalystIT)" <martin@catalyst.net.nz>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: [RFC] Introduce git-xxdiff to invoke xxdiff for manual conflict resolution
Date: Fri, 04 Aug 2006 12:37:44 +1200 [thread overview]
Message-ID: <44D296D8.4030200@catalyst.net.nz> (raw)
In-Reply-To: <7v64h9pdx4.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano wrote:
> We can have unmerged index without MERGE_HEAD (for example,
> think "rebase --merge" or "am -3"); drop check for that and
> instead check for stage 2 ("ours") for the path.
Reading Documentation/git-read-tree.txt it seems to mean that stage 1 is
merge base, 1 is ours and 2 is the branch being merged in.
I am confused...
Quote:
> When performing a merge of another
> branch into the current branch, we use the common ancestor tree
> as <tree1>, the current branch head as <tree2>, and the other
> branch head as <tree3>.
m
--
-----------------------------------------------------------------------
Martin @ Catalyst .Net .NZ Ltd, PO Box 11-053, Manners St, Wellington
WEB: http://catalyst.net.nz/ PHYS: Level 2, 150-154 Willis St
OFFICE: +64(4)916-7224 MOB: +64(21)364-017
Make things as simple as possible, but no simpler - Einstein
-----------------------------------------------------------------------
next prev parent reply other threads:[~2006-08-04 0:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-03 23:53 [RFC] Introduce git-xxdiff to invoke xxdiff for manual conflict resolution Martin Langhoff
2006-08-04 0:01 ` Junio C Hamano
2006-08-04 0:16 ` Martin Langhoff (CatalystIT)
2006-08-04 0:37 ` [RFC] Introduce git-xxdiff to invoke xxdiff for manual conflict resolution - take 2 Martin Langhoff
2006-08-04 8:09 ` Alex Riesen
2006-08-05 3:26 ` Martin Langhoff
2006-08-04 0:37 ` Martin Langhoff (CatalystIT) [this message]
2006-08-04 3:31 ` [RFC] Introduce git-xxdiff to invoke xxdiff for manual conflict resolution Jeff King
2006-08-04 3:48 ` Martin Langhoff (CatalystIT)
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=44D296D8.4030200@catalyst.net.nz \
--to=martin@catalyst.net.nz \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.