Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

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

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:50:50

Dirk Süsserott [off-list ref] writes:
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help