From: Kevin Bracey <kevin@bracey.fi>
To: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: --simplify-merges breakage
Date: Mon, 08 Apr 2013 22:00:35 +0300 [thread overview]
Message-ID: <516313D3.2050309@bracey.fi> (raw)
Commit 4b7f53d ("simplify-merges: drop merge from irrelevant side
branch") appears to have broken simplify-merges.
[Credit to "git bisect run" - and now I see the "report problems
immediately" message on the recent merge of that change.]
I was trying to get my head around history simplification, by creating a
repo with the example shown in the manual.The result of "gitk
--simplify-merges foo" was far from pretty.
With the example in the manual, you should get this:
.-A---M---N---O
/ / /
I B D
\ / /
`---------'
After 4b7f53 you instead get:
.-A---M N---O
/ / / /
I B / D
\ / / /
`---------'
Kevin
next reply other threads:[~2013-04-08 19:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-08 19:00 Kevin Bracey [this message]
2013-04-08 19:54 ` --simplify-merges breakage Junio C Hamano
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=516313D3.2050309@bracey.fi \
--to=kevin@bracey.fi \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).