From: Clemens Buchacher <drizzd@aon.at>
To: Michael Johnson <redbeard@mdjohnson.us>
Cc: git@vger.kernel.org, Miklos Vajna <vmiklos@frugalware.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: Segfault on merge with 1.6.2.1
Date: Mon, 6 Apr 2009 08:41:32 +0200 [thread overview]
Message-ID: <20090406064132.GA25503@localhost> (raw)
In-Reply-To: <op.urx07jgeso3nzr@sulidor.mdjohnson.us>
On Sun, Apr 05, 2009 at 09:29:33PM -0500, Michael Johnson wrote:
>> +# history
>> +#
>> +# a --- c
>> +# / \ /
>> +# root X
>> +# \ / \
>> +# b --- d
>
> This also explains a lot. Is there any way to get this sort of simplified
> representation from the existing tools? I would think gitk would show it,
> but would I be able to recognize it.?
I simply tagged everything that showed up in "git merge-base --all" and then
I did "gitk --all --simplify-by-decoration". That shows pretty much the
graph above.
prev parent reply other threads:[~2009-04-06 6:43 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-28 16:19 Segfault on merge with 1.6.2.1 Michael Johnson
2009-03-29 12:17 ` Miklos Vajna
2009-03-30 2:39 ` Michael Johnson
2009-03-30 7:48 ` Johannes Schindelin
2009-03-30 11:03 ` Miklos Vajna
2009-03-31 7:14 ` Michael Johnson
2009-04-01 5:43 ` Michael Johnson
2009-04-01 9:50 ` Miklos Vajna
2009-04-01 18:06 ` Clemens Buchacher
2009-04-02 0:33 ` Michael Johnson
2009-04-05 0:46 ` Clemens Buchacher
2009-04-05 0:46 ` [PATCH 1/3] add tests for merging with submodules Clemens Buchacher
2009-04-05 0:46 ` [PATCH 2/3] update cache for conflicting submodule entries Clemens Buchacher
2009-04-05 0:47 ` [PATCH 3/3] simplify output of conflicting merge Clemens Buchacher
2009-04-05 9:47 ` Junio C Hamano
2009-04-05 11:50 ` Segfault on merge with 1.6.2.1 Johannes Schindelin
2009-04-06 2:29 ` Michael Johnson
2009-04-06 6:41 ` Clemens Buchacher [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=20090406064132.GA25503@localhost \
--to=drizzd@aon.at \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=redbeard@mdjohnson.us \
--cc=vmiklos@frugalware.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 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.