git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: Paul Mackerras <paulus@samba.org>
Cc: git@vger.kernel.org
Subject: Re: Display of merges in gitk
Date: Fri, 29 Jul 2005 21:25:41 -0700	[thread overview]
Message-ID: <7vy87o6htm.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <17130.56620.137642.941175@cargo.ozlabs.ibm.com> (Paul Mackerras's message of "Fri, 29 Jul 2005 20:51:40 -0500")

Paul Mackerras <paulus@samba.org> writes:

> Linus, could you do a pull from the usual place to pick this up?
> (rsync://rsync.kernel.org/pub/scm/gitk/gitk.git).  I also included a
> patch from Junio.

In case you did not notice, /pub/scm/git/git.git/ repository is
under the care of yours truly starting this week.  I've merged
from your tree up to this commit:

    commit c8a4acbf4a7b0f9da3e320877b2b2d12cd58700b
    Author: Paul Mackerras <paulus@samba.org>
    Date:   Fri Jul 29 09:23:03 2005 -0500

      Improve the merge display when the result differs from all parents.

      Now we see if the result is quite similar to one of the parents, and
      if it is, display the result as a diff from that parent.  If the result
      is similar to more than one parent, pick the one that it's most
      similar to.

Thanks for the great tool.

  reply	other threads:[~2005-07-30  4:27 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-07-30  1:51 Display of merges in gitk Paul Mackerras
2005-07-30  4:25 ` Junio C Hamano [this message]
2005-07-30 21:36   ` Shipping gitk as part of core git Junio C Hamano
2005-07-31 12:00     ` Paul Mackerras
2005-07-31 18:48       ` Junio C Hamano
2005-07-30 14:32 ` gitk merge display bugs (was: Re: Display of merges in gitk) Sergey Vlasov
2005-08-05 14:10 ` Display of merges in gitk Linus Torvalds
2005-08-05 14:37   ` gitk "hyperlinks" (was Re: Display of merges in gitk) Linus Torvalds
2005-08-05 18:51     ` jepler
2005-08-06  3:36     ` Kay Sievers
2005-08-06 15:44       ` Linus Torvalds
2005-08-07  5:51         ` Kay Sievers
2005-08-06 18:27       ` gitweb "tag" display Junio C Hamano
2005-08-06 18:49         ` Junio C Hamano
2005-08-19 23:21           ` Paul Mackerras
2005-08-19 23:43             ` Johannes Schindelin
2005-08-20 19:09             ` Junio C Hamano
2005-08-07  5:50         ` Kay Sievers
2005-08-06 13:16     ` gitk "hyperlinks" (was Re: Display of merges in gitk) Paul Mackerras
2005-08-06 16:20       ` Linus Torvalds
2005-08-06 17:07         ` jepler
2005-08-06 17:59         ` gitk SHA link hovers Linus Torvalds
2005-08-07 12:04           ` Paul Mackerras
2005-08-06 16:31       ` gitk "hyperlinks" Junio C Hamano
2005-08-07 12:05         ` Paul Mackerras

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=7vy87o6htm.fsf@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=git@vger.kernel.org \
    --cc=paulus@samba.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).