git diff external without additional script

git config --global diff.external 'bash -c "meld $2 $5"'

0
By: cakyus
2013-10-17 10:40:03

These Might Interest You

  • I put this in a shell script called "svndiff", as it provides a handy decorated "svn diff" output that is colored (which you can't see here) and paged. The -r is required so less doesn't mangle the color codes. Show Sample Output


    2
    svn diff $* | colordiff | less -r
    introp · 2009-02-18 16:19:08 2
  • You got some results in two variables within your shell script and would like to find the differences? Changes in process lists, reworked file contents, ... . No need to write to temporary files. You can use all the diff parameters you'll need. Maybe anything like $ grep "^>" is helpful afterwards.


    26
    diff <(echo "$a") <(echo "$b")
    olorin · 2009-07-15 07:26:23 2
  • For editing files added to the index: vim `git diff --name-only --cached` To edit all changed files: vim `git diff --name-only HEAD` To edit changed files matching glob: vim `git diff --name-only -- '*.html'` If the commands needs to support filenames with whitespace, it gets a bit hacky (see http://superuser.com/questions/336016/invoking-vi-through-find-xargs-breaks-my-terminal-why for the reason): git diff --name-only -z | xargs -0 bash -c '</dev/tty vim "$@"' x The last part can be put in a script named e.g. vimargs, and used with any command outputting NUL separated filenames: git grep -lz foobar | vimargs


    4
    vim `git diff --name-only`
    mbudde · 2015-02-25 11:12:49 0
  • Sometimes you need to compare two config files on different servers. Put the file names into the above script and let 'er rip.


    3
    Diff files over SSH: ssh [login]@[host] "cat [remote file]" | diff - "[local file]"
    dennisfaust · 2011-04-28 16:59:56 2

What do you think?

Any thoughts on this command? Does it work on your machine? Can you do the same thing with only 14 characters?

You must be signed in to comment.

What's this?

commandlinefu.com is the place to record those command-line gems that you return to again and again. That way others can gain from your CLI wisdom and you from theirs too. All commands can be commented on, discussed and voted up or down.

Share Your Commands



Stay in the loop…

Follow the Tweets.

Every new command is wrapped in a tweet and posted to Twitter. Following the stream is a great way of staying abreast of the latest commands. For the more discerning, there are Twitter accounts for commands that get a minimum of 3 and 10 votes - that way only the great commands get tweeted.

» http://twitter.com/commandlinefu
» http://twitter.com/commandlinefu3
» http://twitter.com/commandlinefu10

Subscribe to the feeds.

Use your favourite RSS aggregator to stay in touch with the latest commands. There are feeds mirroring the 3 Twitter streams as well as for virtually every other subset (users, tags, functions,…):

Subscribe to the feed for: