Google Git
Sign in
googlers / jrn / git / 301ac38b12126133445d544f7cc5d65768b9310f
commit301ac38b12126133445d544f7cc5d65768b9310f[log] [tgz]
authorTheodore Ts'o <tytso@mit.edu>Sun Jun 10 11:17:30 2007 -0400
committerTheodore Ts'o <tytso@mit.edu>Sun Jun 10 11:17:30 2007 -0400
treeb4ed00b6880b2f118b93baeb28e6a0301c083db2
parent730b5b45fb8a7751106885d350466c197b671b1c [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>
1 file changed
tree: b4ed00b6880b2f118b93baeb28e6a0301c083db2
  1. arm/
  2. compat/
  3. contrib/
  4. Documentation/
  5. git-gui/
  6. gitweb/
  7. mozilla-sha1/
  8. perl/
  9. ppc/
  10. t/
  11. templates/
  12. xdiff/
  13. RelNotes ⇨ Documentation/RelNotes-1.5.3.txt
  14. .gitignore
  15. .mailmap
  16. alloc.c
  17. archive-tar.c
  18. archive-zip.c
  19. archive.h
  20. attr.c
  21. attr.h
  22. base85.c
  23. blob.c
  24. blob.h
  25. builtin-add.c
  26. builtin-annotate.c
  27. builtin-apply.c
  28. builtin-archive.c
  29. builtin-blame.c
  30. builtin-branch.c
  31. builtin-bundle.c
  32. builtin-cat-file.c
  33. builtin-check-attr.c
  34. builtin-check-ref-format.c
  35. builtin-checkout-index.c
  36. builtin-commit-tree.c
  37. builtin-config.c
  38. builtin-count-objects.c
  39. builtin-describe.c
  40. builtin-diff-files.c
  41. builtin-diff-index.c
  42. builtin-diff-tree.c
  43. builtin-diff.c
  44. builtin-fetch--tool.c
  45. builtin-fmt-merge-msg.c
  46. builtin-for-each-ref.c
  47. builtin-fsck.c
  48. builtin-gc.c
  49. builtin-grep.c
  50. builtin-init-db.c
  51. builtin-log.c
  52. builtin-ls-files.c
  53. builtin-ls-tree.c
  54. builtin-mailinfo.c
  55. builtin-mailsplit.c
  56. builtin-merge-base.c
  57. builtin-merge-file.c
  58. builtin-mv.c
  59. builtin-name-rev.c
  60. builtin-pack-objects.c
  61. builtin-pack-refs.c
  62. builtin-prune-packed.c
  63. builtin-prune.c
  64. builtin-push.c
  65. builtin-read-tree.c
  66. builtin-reflog.c
  67. builtin-rerere.c
  68. builtin-rev-list.c
  69. builtin-rev-parse.c
  70. builtin-revert.c
  71. builtin-rm.c
  72. builtin-runstatus.c
  73. builtin-shortlog.c
  74. builtin-show-branch.c
  75. builtin-show-ref.c
  76. builtin-stripspace.c
  77. builtin-symbolic-ref.c
  78. builtin-tar-tree.c
  79. builtin-unpack-objects.c
  80. builtin-update-index.c
  81. builtin-update-ref.c
  82. builtin-upload-archive.c
  83. builtin-verify-pack.c
  84. builtin-write-tree.c
  85. builtin.h
  86. cache-tree.c
  87. cache-tree.h
  88. cache.h
  89. check-builtins.sh
  90. check-racy.c
  91. color.c
  92. color.h
  93. combine-diff.c
  94. commit.c
  95. commit.h
  96. config.c
  97. config.mak.in
  98. configure.ac
  99. connect.c
  100. convert-objects.c
  101. convert.c
  102. copy.c
  103. COPYING
  104. csum-file.c
  105. csum-file.h
  106. ctype.c
  107. daemon.c
  108. date.c
  109. decorate.c
  110. decorate.h
  111. delta.h
  112. diff-delta.c
  113. diff-lib.c
  114. diff.c
  115. diff.h
  116. diffcore-break.c
  117. diffcore-delta.c
  118. diffcore-order.c
  119. diffcore-pickaxe.c
  120. diffcore-rename.c
  121. diffcore.h
  122. dir.c
  123. dir.h
  124. dump-cache-tree.c
  125. entry.c
  126. environment.c
  127. exec_cmd.c
  128. exec_cmd.h
  129. fast-import.c
  130. fetch-pack.c
  131. fetch.c
  132. fetch.h
  133. generate-cmdlist.sh
  134. git-add--interactive.perl
  135. git-am.sh
  136. git-archimport.perl
  137. git-bisect.sh
  138. git-checkout.sh
  139. git-clean.sh
  140. git-clone.sh
  141. git-commit.sh
  142. git-compat-util.h
  143. git-cvsexportcommit.perl
  144. git-cvsimport.perl
  145. git-cvsserver.perl
  146. git-fetch.sh
  147. git-instaweb.sh
  148. git-lost-found.sh
  149. git-ls-remote.sh
  150. git-merge-octopus.sh
  151. git-merge-one-file.sh
  152. git-merge-ours.sh
  153. git-merge-resolve.sh
  154. git-merge-stupid.sh
  155. git-merge.sh
  156. git-mergetool.sh
  157. git-p4import.py
  158. git-parse-remote.sh
  159. git-pull.sh
  160. git-quiltimport.sh
  161. git-rebase.sh
  162. git-relink.perl
  163. git-remote.perl
  164. git-repack.sh
  165. git-request-pull.sh
  166. git-reset.sh
  167. git-send-email.perl
  168. git-sh-setup.sh
  169. git-submodule.sh
  170. git-svn.perl
  171. git-svnimport.perl
  172. git-tag.sh
  173. git-verify-tag.sh
  174. GIT-VERSION-GEN
  175. git.c
  176. git.spec.in
  177. gitk
  178. grep.c
  179. grep.h
  180. hash-object.c
  181. help.c
  182. http-fetch.c
  183. http-push.c
  184. http.c
  185. http.h
  186. ident.c
  187. imap-send.c
  188. index-pack.c
  189. INSTALL
  190. interpolate.c
  191. interpolate.h
  192. list-objects.c
  193. list-objects.h
  194. local-fetch.c
  195. lockfile.c
  196. log-tree.c
  197. log-tree.h
  198. mailmap.c
  199. mailmap.h
  200. Makefile
  201. match-trees.c
  202. merge-file.c
  203. merge-index.c
  204. merge-recursive.c
  205. merge-tree.c
  206. mktag.c
  207. mktree.c
  208. object-refs.c
  209. object.c
  210. object.h
  211. pack-check.c
  212. pack-redundant.c
  213. pack-write.c
  214. pack.h
  215. pager.c
  216. patch-delta.c
  217. patch-id.c
  218. patch-ids.c
  219. patch-ids.h
  220. path-list.c
  221. path-list.h
  222. path.c
  223. peek-remote.c
  224. pkt-line.c
  225. pkt-line.h
  226. progress.c
  227. progress.h
  228. quote.c
  229. quote.h
  230. reachable.c
  231. reachable.h
  232. read-cache.c
  233. README
  234. receive-pack.c
  235. reflog-walk.c
  236. reflog-walk.h
  237. refs.c
  238. refs.h
  239. remote.c
  240. remote.h
  241. revision.c
  242. revision.h
  243. rsh.c
  244. rsh.h
  245. run-command.c
  246. run-command.h
  247. send-pack.c
  248. server-info.c
  249. setup.c
  250. sha1_file.c
  251. sha1_name.c
  252. shallow.c
  253. shell.c
  254. show-index.c
  255. sideband.c
  256. sideband.h
  257. ssh-fetch.c
  258. ssh-pull.c
  259. ssh-push.c
  260. ssh-upload.c
  261. strbuf.c
  262. strbuf.h
  263. symlinks.c
  264. tag.c
  265. tag.h
  266. tar.h
  267. test-chmtime.c
  268. test-date.c
  269. test-delta.c
  270. test-genrandom.c
  271. test-match-trees.c
  272. test-sha1.c
  273. test-sha1.sh
  274. trace.c
  275. tree-diff.c
  276. tree-walk.c
  277. tree-walk.h
  278. tree.c
  279. tree.h
  280. unpack-file.c
  281. unpack-trees.c
  282. unpack-trees.h
  283. update-server-info.c
  284. upload-pack.c
  285. usage.c
  286. utf8.c
  287. utf8.h
  288. var.c
  289. write_or_die.c
  290. wt-status.c
  291. wt-status.h
  292. xdiff-interface.c
  293. xdiff-interface.h