{"thread":{"id":"19862","subject":"visualise the output of git-diff?","startedAt":"2009-06-19T07:32:15Z","lastAt":"2009-06-19T08:47:31Z","messageCount":4,"participants":["Kārlis Repsons","Teemu Likonen","Wincent Colaiuta","David Aguilar"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"116613","messageId":"200906190732.24455.Karlis.Repsons@gmail.com","threadId":"19862","inReplyTo":null,"subject":"visualise the output of git-diff?","fromName":"Kārlis Repsons","fromEmail":"karlis.repsons@gmail.com","sentAt":"2009-06-19T07:32:15Z","receivedAt":"2009-06-19T07:32:15Z","isPatch":false,"sender":{"key":"karlis.repsons@gmail.com","avatar":null},"body":"Hi,\nthis is about displaying git-diff results:\nin case of long text lines, where only a single word may be changed, it would \nbe useful, if that single difference would be displayed in a different \ncolour, but is it possible?\nAnd about pager - are you people all using less or there are also some \nnon-console viewers available?\n\nKārlis\n"},{"id":"116614","messageId":"87r5xgpsnr.fsf@iki.fi","threadId":"19862","inReplyTo":"200906190732.24455.Karlis.Repsons@gmail.com","subject":"Re: visualise the output of git-diff?","fromName":"Teemu Likonen","fromEmail":"tlikonen@iki.fi","sentAt":"2009-06-19T07:52:08Z","receivedAt":"2009-06-19T07:52:08Z","isPatch":false,"sender":{"key":"tlikonen@iki.fi","avatar":null},"body":"On 2009-06-19 07:32 (UTC), Kārlis Repsons wrote:\n\n> this is about displaying git-diff results: in case of long text lines,\n> where only a single word may be changed, it would be useful, if that\n> single difference would be displayed in a different colour, but is it\n> possible?\n\nAt least there is \"git diff --color-words\" but it may not be what you\nwant.\n\n> And about pager - are you people all using less or there are also some\n> non-console viewers available?\n\nI mostly use \"less\" but sometimes also \"kompare\" which is excellent:\n\n    git diff | kompare -\n"},{"id":"116615","messageId":"9553BA37-1651-4A83-90E8-56EB4583F0D8@wincent.com","threadId":"19862","inReplyTo":"200906190732.24455.Karlis.Repsons@gmail.com","subject":"Re: visualise the output of git-diff?","fromName":"Wincent Colaiuta","fromEmail":"win@wincent.com","sentAt":"2009-06-19T08:42:13Z","receivedAt":"2009-06-19T08:42:13Z","isPatch":false,"sender":{"key":"greg@hurrell.net","avatar":"https://avatars.githubusercontent.com/u/7074?v=4"},"body":"El 19/6/2009, a las 9:32, Kārlis Repsons escribió:\n\n> Hi,\n> this is about displaying git-diff results:\n> in case of long text lines, where only a single word may be changed,  \n> it would\n> be useful, if that single difference would be displayed in a different\n> colour, but is it possible?\n\n\nI started working on a patch for that feature a while back and then  \ngot snowed under by other work, but it's still on my TODO list. There  \nwas some discussion on the list about the idea.\n\nThe relevant thread starts with\n\t\n\tMessage-ID: <53497057-1ADE-4300-9F35-B218959606FE@wincent.com>\n\tSubject: RFC: git diff colorization idea\n\nBrowsable copy here:\n\n\thttp://article.gmane.org/gmane.comp.version-control.git/106805\n\nCheers,\nWincent\n"},{"id":"116617","messageId":"20090619084731.GB46896@gmail.com","threadId":"19862","inReplyTo":"87r5xgpsnr.fsf@iki.fi","subject":"Re: visualise the output of git-diff?","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2009-06-19T08:47:31Z","receivedAt":"2009-06-19T08:47:31Z","isPatch":false,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On Fri, Jun 19, 2009 at 10:52:08AM +0300, Teemu Likonen wrote:\n> On 2009-06-19 07:32 (UTC), Kārlis Repsons wrote:\n> \n> At least there is \"git diff --color-words\" but it may not be what you\n> want.\n> \n> > And about pager - are you people all using less or there are also some\n> > non-console viewers available?\n> \n> I mostly use \"less\" but sometimes also \"kompare\" which is excellent:\n> \n>     git diff | kompare -\n\nAnd of course.. don't forget about git-difftool =)\nhttp://kernel.org/pub/software/scm/git/docs/git-difftool.html\n\n\t$ git difftool -t kompare\n\t$ git difftool -t diffuse\n\t$ git difftool -t xxdiff\n\nThe quality of the visualization is only limited by the quality\nof your difftool.  We support lots of them.  From the docs:\n\n\"Valid merge toosl are: kdiff3, kompare, tkdiff, meld,\nxxdiff, emerge, vimdiff, gvimdiff, ecmerge, diffuse,\nopendiff and araxis.\"\n\nLike mergetool, difftool has an extension mechanism in case the\nbuilt-ins are not sufficient.\n\n\nHave fun,\n\n-- \n\t\tDavid\n"}]}