projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 730b5b4) | patch
git-mergetool: Make default selection of merge-tool more intelligent
authorTheodore Ts'o <tytso@mit.edu>
Sun, 10 Jun 2007 15:17:30 +0000 (11:17 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Sun, 10 Jun 2007 15:17:30 +0000 (11:17 -0400)
commit301ac38b12126133445d544f7cc5d65768b9310f
treeb4ed00b6880b2f118b93baeb28e6a0301c083db2tree | snapshot
parent730b5b45fb8a7751106885d350466c197b671b1ccommit | diff
git-mergetool: Make default selection of merge-tool more intelligent

Make git-mergetool prefer meld under GNOME, and kdiff3 under KDE.  When
considering emerge and vimdiff, check $VISUAL and $EDITOR to see which the
user might prefer.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: Josh Triplett <josh@freedesktop.org>
git-mergetool.sh diff | blob | history
Git—the stupid content tracker