From: Paul Mackerras <paulus@samba.org>
To: Jason Holden <jason.k.holden.swdev@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [RFC/PATCH] gitk: Visualize a merge commit with a right-click in gitk
Date: Mon, 31 Dec 2012 15:27:36 +1100 [thread overview]
Message-ID: <20121231042736.GA14921@iris.ozlabs.ibm.com> (raw)
In-Reply-To: <1356826576-24334-1-git-send-email-jason.k.holden.swdev@gmail.com>
On Sat, Dec 29, 2012 at 07:16:16PM -0500, Jason Holden wrote:
> When first doing a merge in git-gui, the "Visualize Merge" button is
> quite helpful to visualize the changes due to a merge.
> But once the merge is complete, there's not a similarly convenient
> way to recreate that merge view in gitk.
>
> This commit adds to gitk the ability to right-click on a merge commit and
> bring up a new gitk window displaying only those commits involved in
> the merge.
>
> When right-clicking on a non-merge commit, this option is grayed out. This
> patch also supports correct visualization of octopus merges
Thanks for the patch. I have a couple of comments about it. First,
the exec command waits for the process to complete, which means that
the initial gitk GUI will be unresponsive until the user quits the
gitk window showing the merge, which could be quite confusing for the
user.
Secondly, gitk already has support for showing multiple views of a
repository, that is, different subsets of the commits. Wouldn't it be
much better to have your new menu item simply create a new view
showing the merge, rather than creating a whole new window?
Paul.
next prev parent reply other threads:[~2012-12-31 4:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-30 0:16 [RFC/PATCH] gitk: Visualize a merge commit with a right-click in gitk Jason Holden
2012-12-31 4:27 ` Paul Mackerras [this message]
2012-12-31 18:46 ` Jason Holden
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=20121231042736.GA14921@iris.ozlabs.ibm.com \
--to=paulus@samba.org \
--cc=git@vger.kernel.org \
--cc=jason.k.holden.swdev@gmail.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).