git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jon Seymour <jon.seymour@gmail.com>
To: Git Mailing List <git@vger.kernel.org>,
	spearce@spearce.org, Johannes Sixt <j.sixt@viscovery.net>
Subject: [PATCH v3 0/2] git-gui: change to display the combined diff in the  case of conflicts.
Date: Wed, 31 Mar 2010 03:34:17 +1200	[thread overview]
Message-ID: <2cfc40321003300834w59532e58m13d42acce4f2c5ce@mail.gmail.com> (raw)

This variant of the patch uses git diff -c instead of git diff HEAD,
at Johannes Sixt's suggestion.

The diff displayed in case of a merge conflict now shows the
differences between the merge result and each of the local and remote
heads and thus now also allows the user to assess the consequences of
"Use Remote Version" by showing how the merge result affects the state
of the local branch.

I have avoided using gmail client to forward this version of  patch
because of documented word-wrapping issues, so hopefully this will
apply cleanly.

[PATCH v3 1/2] git-gui: Introduce is_unmerged global variable to
encapsulate its derivation.
[PATCH v3 2/2] git-gui: change to display the combined diff in the
case of conflicts.

jon.

             reply	other threads:[~2010-03-30 15:34 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-30 15:34 Jon Seymour [this message]
2010-03-31  7:20 ` [PATCH v3 0/2] git-gui: change to display the combined diff in the case of conflicts Johannes Sixt
2010-03-31 11:12   ` Jon Seymour
2010-03-31 11:39     ` Johannes Sixt
2010-03-31 11:50       ` Jon Seymour
2010-03-31 12:23       ` Jon Seymour
2010-03-31 13:51         ` Johannes Sixt
2010-03-31 19:52           ` Jon Seymour
2010-04-02  8:37             ` Johannes Sixt
2010-04-04  6:44               ` Jon Seymour

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=2cfc40321003300834w59532e58m13d42acce4f2c5ce@mail.gmail.com \
    --to=jon.seymour@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=j.sixt@viscovery.net \
    --cc=spearce@spearce.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).