Re: [PATCH 0/5] Colors for git-add--interactive | KernelTrap

Re: [PATCH 0/5] Colors for git-add--interactive

view
thread

!MAILaRCHIVE_VOTE_RePLACE

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

[view in full thread]

From: Junio C Hamano <gitster@...>

To: Dan Zwell <dzwell@...>

Cc: Jeff King <peff@...>, Shawn O. Pearce <spearce@...>, Wincent Colaiuta <win@...>, Git Mailing List <git@...>, Jonathan del Strother <maillist@...>, Johannes Schindelin <Johannes.Schindelin@...>, Frank Lichtenheld <frank@...>, Jakub Narebski <jnareb@...>

Subject: Re: [PATCH 0/5] Colors for git-add--interactive

Date: Thursday, November 22, 2007 - 3:20 pm

Dan Zwell <dzwell@zwell.net> writes:

quoted text> My impression is that diff --cc is called any time
> that HEAD has two parents. Is this correct?

You get combined output when your index is unmerged.

Showing combined output to the user to examine may make sense,
but I think you would want to have the user pick from diff
between stage#2 and the work tree for an unmerged entry, if you
allow to pick hunks during a conflicted merge.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:

[PATCH] Color support added to git-add--interactive., Dan Zwell, (Sat Oct 13, 12:13 am)

Re: [PATCH] Color support added to git-add--interactive., Johannes Schindelin, (Sat Oct 13, 8:25 am)

Re: [PATCH] Color support added to git-add--interactive., Jeff King, (Sat Oct 13, 4:12 am)

Re: [PATCH] Color support added to git-add--interactive., Frank Lichtenheld, (Sat Oct 13, 8:49 am)

Re: [PATCH] Color support added to git-add--interactive., Wincent Colaiuta, (Sat Oct 13, 10:45 am)

Re: [PATCH] Color support added to git-add--interactive., Johannes Schindelin, (Sat Oct 13, 12:38 pm)

Re: [PATCH] Color support added to git-add--interactive., Jean-Luc Herren, (Sat Oct 13, 12:38 pm)

Re: [PATCH] Color support added to git-add--interactive., Wincent Colaiuta, (Sat Oct 13, 1:14 pm)

Re: [PATCH] Color support added to git-add--interactive., Andreas Ericsson, (Sat Oct 13, 2:31 pm)

Re: [PATCH] Color support added to git-add--interactive., Jeff King, (Mon Oct 15, 12:12 am)

Re: [PATCH] Color support added to git-add--interactive., Jeff King, (Sat Oct 13, 1:27 pm)

Re: [PATCH] Color support added to git-add--interactive., Jeff King, (Sat Oct 13, 1:51 pm)

Re: [PATCH] Color support added to git-add--interactive., Dan Zwell, (Sat Oct 13, 4:03 pm)

Re: [PATCH] Color support added to git-add--interactive., Wincent Colaiuta, (Sat Oct 13, 4:36 pm)

Re: [PATCH] Color support added to git-add--interactive., Dan Z, (Sat Oct 13, 5:50 pm)

Re: [PATCH] Color support added to git-add--interactive., Jean-Luc Herren, (Sat Oct 13, 6:23 pm)

Re: [PATCH] Color support added to git-add--interactive., Jeff King, (Sun Oct 14, 11:43 pm)

Re: revised: [PATCH] Color support added to git-add--interac..., Dan Zwell, (Tue Oct 16, 8:47 pm)

Re: revised: [PATCH] Color support added to git-add--interac..., Shawn O. Pearce, (Tue Oct 16, 9:51 pm)

Re: revised: [PATCH] Color support added to git-add--interac..., Dan Zwell, (Wed Oct 17, 3:57 am)

Re: revised: [PATCH] Color support added to git-add--interac..., Shawn O. Pearce, (Wed Oct 17, 4:11 am)

[PATCH 2/2] Let git-add--interactive read colors from git-co..., Dan Zwell, (Mon Oct 22, 5:40 pm)

Re: [PATCH 2/2] Let git-add--interactive read colors from gi..., Jeff King, (Tue Oct 23, 12:27 am)

Re: [PATCH 2/2] Let git-add--interactive read colors from gi..., Dan Zwell, (Tue Oct 23, 4:52 am)

[PATCH 2/2] Let git-add--interactive read colors from .gitco..., Dan Zwell, (Fri Nov 2, 11:41 pm)

Re: *[PATCH 2/2] Let git-add--interactive read colors from ...., Junio C Hamano, (Sat Nov 3, 1:06 am)

Re: *[PATCH 2/2] Let git-add--interactive read colors from ...., Dan Zwell, (Sat Nov 3, 3:26 am)

Re: *[PATCH 2/2] Let git-add--interactive read colors from ...., Junio C Hamano, (Sat Nov 3, 2:11 pm)

[PATCH 1/2] Added basic color support to git add --interactive, Dan Zwell, (Fri Nov 2, 11:41 pm)

Re: [PATCH 1/2] Added basic color support to git add --inter..., Jeff King, (Sun Nov 4, 12:57 am)

Re: [PATCH 1/2] Added basic color support to git add --inter..., Junio C Hamano, (Sun Nov 4, 1:36 am)

Re: [PATCH 1/2] Added basic color support to git add --inter..., Jeff King, (Sun Nov 4, 1:43 am)

Subject: [PATCH 2/3] Let git-add--interactive read colors fr..., Dan Zwell, (Sat Nov 10, 10:23 pm)

Re: Subject: [PATCH 2/3] Let git-add--interactive read color..., Junio C Hamano, (Sun Nov 11, 5:53 am)

Re: Subject: [PATCH 2/3] Let git-add--interactive read color..., Junio C Hamano, (Sun Nov 11, 6:34 am)

Re: Subject: [PATCH 2/3] Let git-add--interactive read color..., Dan Zwell, (Mon Nov 12, 9:39 pm)

Re: Subject: [PATCH 2/3] Let git-add--interactive read color..., Junio C Hamano, (Mon Nov 12, 10:32 pm)

Re: Subject: [PATCH 2/3] Let git-add--interactive read color..., Dan Zwell, (Mon Nov 12, 10:55 pm)

Re: Subject: [PATCH 2/3] Let git-add--interactive read color..., Jeff King, (Tue Nov 13, 3:26 am)

Subject: [PATCH 1/3] Added basic color support to git add --..., Dan Zwell, (Sat Nov 10, 10:23 pm)

[PATCH 0/3] Adding colors to git-add--interactive, Dan Zwell, (Sat Nov 10, 10:21 pm)

[PATCH 3/3] Added diff hunk coloring to git-add--interactive, Dan Zwell, (Sat Nov 10, 8:03 pm)

Re: [PATCH 3/3] Added diff hunk coloring to git-add--interac..., Junio C Hamano, (Sun Nov 11, 6:00 am)

[PATCH 2/3] Let git-add--interactive read colors from .gitco..., Dan Zwell, (Sat Nov 10, 8:02 pm)

[PATCH 1/3] Added basic color support to git add --interactive, Dan Zwell, (Sat Nov 10, 8:01 pm)

[PATCH 0/3] Adding colors to git-add--interactive, Dan Zwell, (Sat Nov 10, 8:01 pm)

[PATCH 5/5] Added diff hunk coloring to git-add--interactive, Dan Zwell, (Thu Nov 22, 6:56 am)

Re: [PATCH 5/5] Added diff hunk coloring to git-add--interac..., Jeff King, (Thu Nov 22, 8:25 am)

Re: [PATCH 5/5] Added diff hunk coloring to git-add--interac..., Junio C Hamano, (Thu Nov 22, 6:35 pm)

Re: [PATCH 5/5] Added diff hunk coloring to git-add--interac..., Junio C Hamano, (Thu Nov 22, 5:37 pm)

Re: [PATCH 5/5] Added diff hunk coloring to git-add--interac..., Jeff King, (Fri Nov 23, 6:21 am)

[PATCH 4/5] Let git-add--interactive read colors from config..., Dan Zwell, (Thu Nov 22, 6:56 am)

Re: [PATCH 4/5] Let git-add--interactive read colors from co..., Jeff King, (Thu Nov 22, 8:18 am)

Re: [PATCH 4/5] Let git-add--interactive read colors from co..., Junio C Hamano, (Thu Nov 22, 5:28 pm)

Re: [PATCH 4/5] Let git-add--interactive read colors from co..., Jeff King, (Thu Nov 22, 6:30 pm)

Re: [PATCH 4/5] Let git-add--interactive read colors from co..., Dan Zwell, (Fri Nov 23, 1:32 am)

Re: [PATCH 4/5] Let git-add--interactive read colors from co..., Jeff King, (Fri Nov 23, 5:09 am)

Re: [PATCH 4/5] Let git-add--interactive read colors from co..., Junio C Hamano, (Fri Nov 23, 5:17 am)

[PATCH 3/5] Added config_default($key, $default) to Git.pm, Dan Zwell, (Thu Nov 22, 6:55 am)

Re: [PATCH 3/5] Added config_default($key, $default) to Git.pm, Jeff King, (Thu Nov 22, 8:14 am)

[PATCH 2/5] Don't return 'undef' in case called in a vector ..., Dan Zwell, (Thu Nov 22, 6:55 am)

Re: [PATCH 2/5] Don't return 'undef' in case called in a vec..., Junio C Hamano, (Thu Nov 22, 5:17 pm)

Re: [PATCH 2/5] Don't return 'undef' in case called in a vec..., Dan Zwell, (Fri Nov 23, 12:15 am)

Re: [PATCH 2/5] Don't return 'undef' in case called in a vec..., Jeff King, (Thu Nov 22, 8:06 am)

[PATCH 1/5] Added basic color support to git add --interactive, Dan Zwell, (Thu Nov 22, 6:54 am)

[PATCH 0/5] Colors for git-add--interactive, Dan Zwell, (Thu Nov 22, 6:54 am)

Re: [PATCH 0/5] Colors for git-add--interactive, Junio C Hamano, (Thu Nov 22, 3:20 pm)

Re: [PATCH 0/5] Colors for git-add--interactive, Jeff King, (Thu Nov 22, 7:57 am)

Re: [PATCH 0/3] Adding colors to git-add--interactive, Jeff King, (Sun Nov 11, 3:54 am)

Re: [PATCH 0/3] Adding colors to git-add--interactive, Junio C Hamano, (Sun Nov 11, 4:23 am)

Re: [PATCH 0/3] Adding colors to git-add--interactive, Dan Zwell, (Sun Nov 11, 4:39 am)

[PATCH 1/2] Added basic color support to git add --interactive, Dan Zwell, (Mon Oct 22, 5:32 pm)

Re: [PATCH 1/2] Added basic color support to git add --inter..., Jeff King, (Tue Oct 23, 12:03 am)

Re: [PATCH 1/2] Added basic color support to git add --inter..., Wincent Colaiuta, (Tue Oct 23, 2:28 am)

Re: [PATCH 1/2] Added basic color support to git add --inter..., Jeff King, (Tue Oct 23, 2:41 am)

Re: [PATCH 1/2] Added basic color support to git add --inter..., Wincent Colaiuta, (Tue Oct 23, 3:44 am)

[PATCH] Let git-add--interactive read "git colors" from git-..., Dan Zwell, (Mon Oct 22, 10:19 pm)

Re: [PATCH] Let git-add--interactive read "git colors" from ..., Jeff King, (Tue Oct 23, 12:29 am)

Re: [PATCH] Let git-add--interactive read "git colors" from ..., Shawn O. Pearce, (Tue Oct 23, 12:40 am)

Re: [PATCH] resend of git-add--interactive color patch again..., Dan Zwell, (Mon Oct 22, 10:11 pm)

Re: [PATCH] Color support added to git-add--interactive., Tom Tobin, (Sat Oct 13, 4:21 pm)

Re: [PATCH] Color support added to git-add--interactive., Tom Tobin, (Sat Oct 13, 4:26 pm)

Navigation

Popular discussions


linux-kernel:
Mark Lord	2.6.25-rc8: FTP transfer errors
Kamalesh Babulal	Re: 2.6.23-rc6-mm1
Greg Kroah-Hartman	[PATCH 025/196] paride: Convert from class_device to device for block/paride
Stephen Rothwell	Announce: Linux-next (Or Andrew's dream :-))
git:

linux-netdev:
Linus Torvalds	Re: iptables very slow after commit 784544739a25c30637397ace5489eeb6e15d7d49
David Miller	Re: [GIT]: Networking
Gerrit Renker	[PATCH 18/37] dccp: Support for Mandatory options
Jarek Poplawski	[PATCH] pkt_sched: Destroy gen estimators under rtnl_lock().
openbsd-misc:

Colocation donated by:

Who's online

There are currently 13 users and 1045 guests online.

Online users

Syndicate