{"thread":{"id":"13773","subject":"External diff viewer and stage/merge tool and git-gui?","startedAt":"2008-06-03T07:24:28Z","lastAt":"2008-06-03T13:40:32Z","messageCount":3,"participants":["Peter Karlsson","David Aguilar"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"78464","messageId":"Pine.LNX.4.64.0806030819310.31572@ds9.cixit.se","threadId":"13773","inReplyTo":null,"subject":"External diff viewer and stage/merge tool and git-gui?","fromName":"Peter Karlsson","fromEmail":"peter@softwolves.pp.se","sentAt":"2008-06-03T07:24:28Z","receivedAt":"2008-06-03T07:24:28Z","isPatch":false,"sender":{"key":"peter@softwolves.pp.se","avatar":"https://avatars.githubusercontent.com/u/990764?v=4"},"body":"Hi!\n\nAs I continue to introduce Git at my workplace, I got the question on\nhow to integrate external diff tools with Git. I figured out a way to\nget it to work with the command-line \"git-diff\", by setting\nGIT_EXTERNAL_DIFF and hacking together a small batch file (yeah, this\nis on Windows) that opens the diff in the viewer. For myself, I would\nlike to use tkdiff, whereas the rest of the team is used to another\nside-by-side diff viewer.\n\nHowever, I cannot seem to find a way to do it from git-gui, which is\nthe tool I have taught the rest of the team to use as their primary\ninterface. Is there a way to view the currently selected difference in\nan external diff viewer?\n\n\nEven better would be a way to allow that external tool to edit what is\nto be staged - we are having some problems with version-controlling\nsources in some of Borland's tools which have the bad habit of storing\nlocal configuration in the project files, and git-gui's \"hunk\" picker\ncannot be used to pick the relevant changes (we have to set \"show less\ndifferences\" to the lowest value to get a proper hunk view, and then\ngit-gui cannot stage anything).\n\n-- \n\\\\// Peter - http://www.softwolves.pp.se/\n"},{"id":"78478","messageId":"402731c90806030356r1ea4317vef40b6449f4fca16@mail.gmail.com","threadId":"13773","inReplyTo":"Pine.LNX.4.64.0806030819310.31572@ds9.cixit.se","subject":"Re: External diff viewer and stage/merge tool and git-gui?","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2008-06-03T10:56:03Z","receivedAt":"2008-06-03T10:56:03Z","isPatch":false,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On Tue, Jun 3, 2008 at 12:24 AM, Peter Karlsson <peter@softwolves.pp.se> wrote:\n> Hi!\n>\n> As I continue to introduce Git at my workplace, I got the question on\n> how to integrate external diff tools with Git. I figured out a way to\n> get it to work with the command-line \"git-diff\", by setting\n> GIT_EXTERNAL_DIFF and hacking together a small batch file (yeah, this\n> is on Windows) that opens the diff in the viewer. For myself, I would\n> like to use tkdiff, whereas the rest of the team is used to another\n> side-by-side diff viewer.\n\nHave you taken a look at ugit?\n\nhttp://repo.or.cz/w/ugit.git\n(requires the latest GitPython http://gitorious.org/projects/git-python/)\n\nIt can launch external diff tools.  It also has a very fine diff gui.\nYou can either select the entire diff hunk or, if you need to be more\nprecise, drill down to specific lines from a diff.\n\nIf the built-in diff selection doesn't suffice just right-click in the\nmodified files section where there's an option to send the diff to a\ndiff editor.  You can define that to be tkdiff, xxdiff, etc.\n\n-- \n David\n"},{"id":"78498","messageId":"Pine.LNX.4.64.0806031439060.31572@ds9.cixit.se","threadId":"13773","inReplyTo":"402731c90806030356r1ea4317vef40b6449f4fca16@mail.gmail.com","subject":"Re: External diff viewer and stage/merge tool and git-gui?","fromName":"Peter Karlsson","fromEmail":"peter@softwolves.pp.se","sentAt":"2008-06-03T13:40:32Z","receivedAt":"2008-06-03T13:40:32Z","isPatch":false,"sender":{"key":"peter@softwolves.pp.se","avatar":"https://avatars.githubusercontent.com/u/990764?v=4"},"body":"David Aguilar:\n\n> Have you taken a look at ugit?\n\nTried to now, but can't get it to quite work due to dependencies of\ndependencies[1]. And is it possible to install it on a Windows box without\nCygwin?\n\n-- \n\\\\// Peter - http://www.softwolves.pp.se/\n\n [1] GitPython install failes with \"ImportError: No module named ez_setup\"\n"}]}