From: "Yann Dirson" <ydirson@altern.org>
To: git@vger.kernel.org
Subject: gitk: showing onging merge as such ?
Date: Thu, 7 May 2009 13:46:52 +0200 (CEST) [thread overview]
Message-ID: <53018.10.0.0.1.1241696812.squirrel@intranet.linagora.com> (raw)
While resolving a conflicted merge, I wondered if there was any reason why
gitk does not show that we are indeed doing a merge, by showing the staged
contents as a merge commit if MERGE_HEAD is found.
Is there any reason why we would not do this ?
I had a quick try at how this could be done, here it is. The diff is not
yet displayed as combined.
reply other threads:[~2009-05-07 11:57 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=53018.10.0.0.1.1241696812.squirrel@intranet.linagora.com \
--to=ydirson@altern.org \
--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).