[jbosstools-dev] Git tip for comparing small changes/documents

[phantomjinx]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 01/09/2014 01:43 PM, Max Rydahl Andersen wrote:
> so this is just a FYI/tip on git.
> 
> While looking at this diff it occurred to me worddiff is much nicer to compare these changes
> than normal diff used by git and github.
> 
> If you have this PR checked out you can do:
> 
> `git diff 4.40.x`
> 
> which gives you: http://screencast.com/t/KRat75Yy (you got tons of duplicated lines even though
> in this case its just a few parts of the line that has changed.
> 
> In comes word diff: git diff --word-diff 4.40.x
> 
> which gives you: http://screencast.com/t/gmrBCmRfEKI
> 
> Now no duplicated lines and you can more easily spot what changed.
> 
> But you can even go further: git diff --word-diff-regex=. --color-words 4.40.x
> 
> which gives you: http://screencast.com/t/nGpbD9EQ7B
> 
> Now its just the character diffs.
> 
> ps. you can remove --color-words if you like to have the {+} {-} but I find it a bit too noisy
> at this level.
> 
> This word-diff is especially good to comparing textual documents as oppose to code where the
> normal line diff often are better.
> 
> Just thought I would share that little time saver.
> 
> /max

+1

That's really helpful! Thanks for that max.

PGR

- -- 
Paul Richardson

  * p.g.richardson at phantomjinx.co.uk
  * p.g.richardson at redhat.com
  * pgrichardson at linux.com

"I know exactly who reads the papers ...

  * The Daily Mirror is read by people who think they run the country.
  * The Guardian is read by people who think they ought to run the country.
  * The Times is read by people who do actually run the country.
  * The Daily Mail is read by the wives of the people who run the country.
  * The Financial Times is read by the people who own the country.
  * The Morning Star is read by the people who think the country ought to be run by another country.
  * The Daily Telegraph is read by the people who think it is."

Jim Hacker, Yes Minister

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iEYEARECAAYFAlLOqiEACgkQcthLMIwdEb17kwCeNpbiNBjagFcp+u86cGKL/j5R
UuYAn2G9LV901VyLjLgazarN7Q22a/7e
=LYVZ
-----END PGP SIGNATURE-----