<?xml version="1.0" encoding="UTF-8"?>
<rss version="2.0"
	xmlns:content="http://purl.org/rss/1.0/modules/content/"
	xmlns:wfw="http://wellformedweb.org/CommentAPI/"
	xmlns:dc="http://purl.org/dc/elements/1.1/"
	xmlns:atom="http://www.w3.org/2005/Atom"
	xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
	xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
	>

<channel>
	<title>brunotavares.net: ScrapBook &#187; git</title>
	<atom:link href="https://blog.brunotavares.net/?feed=rss2&#038;tag=git" rel="self" type="application/rss+xml" />
	<link>https://blog.brunotavares.net</link>
	<description>Notes. tech and a few thoughs</description>
	<lastBuildDate>Sun, 25 Nov 2018 17:59:26 +0000</lastBuildDate>
	<language>en-US</language>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
	<generator>http://wordpress.org/?v=3.5</generator>
		<item>
		<title>Visual Diffs</title>
		<link>https://blog.brunotavares.net/?p=245</link>
		<comments>https://blog.brunotavares.net/?p=245#comments</comments>
		<pubDate>Tue, 02 Dec 2008 22:48:49 +0000</pubDate>
		<dc:creator>bat</dc:creator>
				<category><![CDATA[Tips]]></category>
		<category><![CDATA[git]]></category>
		<category><![CDATA[linux]]></category>
		<category><![CDATA[svn]]></category>

		<guid isPermaLink="false">http://blog.brunotavares.net/?p=245</guid>
		<description><![CDATA[For some time now i started to notice the amount of time i wasted in solving version conflicts. The GNU diff works great with small change sets, but having a visual diff tool helps a lot when you&#8217;re dealing with long files with lots of diffs. I used several visuall-diff-editors whit the several version-control software [...]]]></description>
				<content:encoded><![CDATA[<p>For some time now i started to notice the amount of time i wasted in solving version conflicts. The GNU diff works great with small change sets, but having a visual diff tool helps a lot when you&#8217;re dealing with long files with lots of diffs. </p>
<p>I used several visuall-diff-editors whit the several version-control software and i currently use Meld: it&#8217;s gtk, has in-line edition ( let&#8217;s you change the working copy with a real-time diff computing ) and its &#8220;command line diff&#8221; and diff3 compatible which makes it work smoothly with version-control software.</p>
<p>So, for the both version-control systems that i use currently here is my setup</p>
<h4>SVN</h4>
<p>For a quick diff using meld just run:</p>
<p><code>$ svn diff--diff-cmd meld</code></p>
<p>For a permanent setup edit <code>~/.subversion/config</code> and set the <code>diff-cmd</code> to <code>meld</code></p>
<h4>GIT</h4>
<p>Write a small wrapper:</p>
<pre>
<code>
#!/usr/bin/env sh
meld $2 $5
</code>
</pre>
<p>and the just configure svn to use the wrapper as diff tool</p>
<p><code>git config --global diff.external /path/to/wrapper </code></p>
]]></content:encoded>
			<wfw:commentRss>https://blog.brunotavares.net/?feed=rss2&#038;p=245</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
	</channel>
</rss>
