* [PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.
@ 2010-03-29 23:00 Jon Seymour
2010-03-29 23:02 ` Jon Seymour
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Jon Seymour @ 2010-03-29 23:00 UTC (permalink / raw)
To: Git Mailing List, spearce
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.
jon.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.
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
2 siblings, 0 replies; 5+ messages in thread
From: Jon Seymour @ 2010-03-29 23:02 UTC (permalink / raw)
To: Git Mailing List, spearce
| __not__ -> __now__
On Tue, Mar 30, 2010 at 10:00 AM, Jon Seymour <jon.seymour@gmail.com> wrote:
> 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 __now__ 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.
>
> jon.
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.
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
2 siblings, 0 replies; 5+ messages in thread
From: Jon Seymour @ 2010-03-29 23:08 UTC (permalink / raw)
To: Git Mailing List, spearce
Apologies, it broke again.
The command I ran to submit the patch was:
git format-patch -M git-gui-patch~2.. --stdout | git imap-send
I did with git 1.6.6.1, running on cygwin however this process appears
to be corrupting the patch.
Can anyone let me know what I have done wrong?
jon.
On Tue, Mar 30, 2010 at 10:00 AM, Jon Seymour <jon.seymour@gmail.com> wrote:
> 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.
>
> jon.
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.
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
[not found] ` <2cfc40321003292359u2b4d3fcfved860ab28338709a@mail.gmail.com>
2 siblings, 1 reply; 5+ messages in thread
From: Johannes Sixt @ 2010-03-30 6:44 UTC (permalink / raw)
To: Jon Seymour; +Cc: Git Mailing List, spearce
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.
[not found] ` <2cfc40321003292359u2b4d3fcfved860ab28338709a@mail.gmail.com>
@ 2010-03-30 7:00 ` Jon Seymour
0 siblings, 0 replies; 5+ messages in thread
From: Jon Seymour @ 2010-03-30 7:00 UTC (permalink / raw)
To: Git Mailing List
And to the list...
On Tue, Mar 30, 2010 at 5:44 PM, Johannes Sixt <j.sixt@viscovery.net> wrote:
> 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...
You mean in a similar way to the way that gitk displays the diff when
you select a merge commit?
jon.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-03-30 7:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
[not found] ` <2cfc40321003292359u2b4d3fcfved860ab28338709a@mail.gmail.com>
2010-03-30 7:00 ` Jon Seymour
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.