From: Johannes Sixt <j.sixt@viscovery.net>
To: Jon Seymour <jon.seymour@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>, spearce@spearce.org
Subject: Re: [PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.
Date: Tue, 30 Mar 2010 08:44:13 +0200 [thread overview]
Message-ID: <4BB19DBD.90009@viscovery.net> (raw)
In-Reply-To: <2cfc40321003291600q70f0839bt8720dd025a3891f6@mail.gmail.com>
Am 3/30/2010 1:00, schrieb Jon Seymour:
> Resending because my original patch series wasn't whitespace clean and
> I have now removed the configuration to make the safe behaviour
> optional - it is not safe by default.
>
> If there is any other reason why this patch should not be considered,
> please let me know.
>
> [PATCH v2 1/2] git-gui: Introduce is_unmerged global variable to
> encapsulate its derivation.
> [PATCH v2 2/2] git-gui: change to display the diff with the HEAD in
> the case of conflicts.
The default mode of diff in the case of conflicts is "condensed combined",
which removes "unintersting" changes from the display. AFAIK, there also
exists a mode that is only "combined". I would think that this mode is
much more useful here because it shows the diff to both HEAD and
MERGE_HEADs at the same time.
Only that I don't know how to invoke this mode...
-- Hannes
next prev parent reply other threads:[~2010-03-30 6:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-29 23:00 [PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts Jon Seymour
2010-03-29 23:02 ` Jon Seymour
2010-03-29 23:08 ` Jon Seymour
2010-03-30 6:44 ` Johannes Sixt [this message]
[not found] ` <2cfc40321003292359u2b4d3fcfved860ab28338709a@mail.gmail.com>
2010-03-30 7:00 ` 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=4BB19DBD.90009@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=jon.seymour@gmail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.