Re: Meaning of double + and - in Gitk's diff pane

Am 21.03.2011 20:37 schrieb Junio C Hamano:

Dirk Süsserott[off-list ref]  writes:

quoted

I regularly use gitk to get an overview. Great tool.
But sometimes it shows me in the diff pane lines preceeded
with two + or - signs or they are colored in blue or black
or printed in bold. I think this is true for merge commits
with conflicts.

Look at the bottom summary of this message for a brief summary:

   http://thread.gmane.org/gmane.comp.version-control.git/15486/focus=15527

If you want to know more about how the multi-way diff is condensed, you
would find this message from Linus in the same thread illuminating:

   http://thread.gmane.org/gmane.comp.version-control.git/15486/focus=15600

(Ignore the bottom part where Linus complains about gitk output---the old
implementation in gitk has gone long time ago).

And also this one, again from Linus:

   http://thread.gmane.org/gmane.comp.version-control.git/15486/focus=15491

--
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

Junio, thanks. When I've found the time, I'll probably condense Linus'
explanations and submit a documentation patch. It's not explained
in the actual git docs, right?