Skip to content

Instantly share code, notes, and snippets.

@jlatt

jlatt/git-ediff

Created March 21, 2012 21:57
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save jlatt/2153517 to your computer and use it in GitHub Desktop.
Save jlatt/2153517 to your computer and use it in GitHub Desktop.
Download ZIP
emacs diff in git
Raw
gistfile1.txt
# ~/.gitconfig
[difftool "ediff"]
cmd = git-ediff "$LOCAL" "$REMOTE"
[diff]
tool = ediff
Raw
git-ediff
#!/bin/bash
emacsclient -e "(ediff \"$1\" \"$2\")"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment