Google Git
Sign in
googlers / jrn / git / 21d0ba7ebb0c6b6c6ad844f8a40fff8dd4c0b105
commit21d0ba7ebb0c6b6c6ad844f8a40fff8dd4c0b105[log] [tgz]
authorDavid Aguilar <davvid@gmail.com>Wed Apr 08 00:17:20 2009 -0700
committerJunio C Hamano <gitster@pobox.com>Wed Apr 08 00:25:24 2009 -0700
treec09c3a743b2fe74f793607c360b533f06af7d653
parent9a62d72dfa833f98dd0730b3d5136f56d637a5c3 [diff]
difftool/mergetool: refactor commands to use git-mergetool--lib

This consolidates the common functionality from git-mergetool and
git-difftool--helper into a single git-mergetool--lib scriptlet.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
6 files changed
tree: c09c3a743b2fe74f793607c360b533f06af7d653
  1. arm/
  2. compat/
  3. contrib/
  4. Documentation/
  5. git-gui/
  6. gitk-git/
  7. gitweb/
  8. mozilla-sha1/
  9. perl/
  10. ppc/
  11. t/
  12. templates/
  13. xdiff/
  14. RelNotes ⇨ Documentation/RelNotes-1.6.3.txt
  15. .gitattributes
  16. .gitignore
  17. .mailmap
  18. abspath.c
  19. alias.c
  20. alloc.c
  21. archive-tar.c
  22. archive-zip.c
  23. archive.c
  24. archive.h
  25. attr.c
  26. attr.h
  27. base85.c
  28. blob.c
  29. blob.h
  30. branch.c
  31. branch.h
  32. builtin-add.c
  33. builtin-annotate.c
  34. builtin-apply.c
  35. builtin-archive.c
  36. builtin-blame.c
  37. builtin-branch.c
  38. builtin-bundle.c
  39. builtin-cat-file.c
  40. builtin-check-attr.c
  41. builtin-check-ref-format.c
  42. builtin-checkout-index.c
  43. builtin-checkout.c
  44. builtin-clean.c
  45. builtin-clone.c
  46. builtin-commit-tree.c
  47. builtin-commit.c
  48. builtin-config.c
  49. builtin-count-objects.c
  50. builtin-describe.c
  51. builtin-diff-files.c
  52. builtin-diff-index.c
  53. builtin-diff-tree.c
  54. builtin-diff.c
  55. builtin-fast-export.c
  56. builtin-fetch--tool.c
  57. builtin-fetch-pack.c
  58. builtin-fetch.c
  59. builtin-fmt-merge-msg.c
  60. builtin-for-each-ref.c
  61. builtin-fsck.c
  62. builtin-gc.c
  63. builtin-grep.c
  64. builtin-help.c
  65. builtin-http-fetch.c
  66. builtin-init-db.c
  67. builtin-log.c
  68. builtin-ls-files.c
  69. builtin-ls-remote.c
  70. builtin-ls-tree.c
  71. builtin-mailinfo.c
  72. builtin-mailsplit.c
  73. builtin-merge-base.c
  74. builtin-merge-file.c
  75. builtin-merge-ours.c
  76. builtin-merge-recursive.c
  77. builtin-merge.c
  78. builtin-mv.c
  79. builtin-name-rev.c
  80. builtin-pack-objects.c
  81. builtin-pack-refs.c
  82. builtin-prune-packed.c
  83. builtin-prune.c
  84. builtin-push.c
  85. builtin-read-tree.c
  86. builtin-receive-pack.c
  87. builtin-reflog.c
  88. builtin-remote.c
  89. builtin-rerere.c
  90. builtin-reset.c
  91. builtin-rev-list.c
  92. builtin-rev-parse.c
  93. builtin-revert.c
  94. builtin-rm.c
  95. builtin-send-pack.c
  96. builtin-shortlog.c
  97. builtin-show-branch.c
  98. builtin-show-ref.c
  99. builtin-stripspace.c
  100. builtin-symbolic-ref.c
  101. builtin-tag.c
  102. builtin-tar-tree.c
  103. builtin-unpack-objects.c
  104. builtin-update-index.c
  105. builtin-update-ref.c
  106. builtin-upload-archive.c
  107. builtin-verify-pack.c
  108. builtin-verify-tag.c
  109. builtin-write-tree.c
  110. builtin.h
  111. bundle.c
  112. bundle.h
  113. cache-tree.c
  114. cache-tree.h
  115. cache.h
  116. check-builtins.sh
  117. check-racy.c
  118. check_bindir
  119. color.c
  120. color.h
  121. combine-diff.c
  122. command-list.txt
  123. commit.c
  124. commit.h
  125. config.c
  126. config.mak.in
  127. configure.ac
  128. connect.c
  129. convert.c
  130. copy.c
  131. COPYING
  132. csum-file.c
  133. csum-file.h
  134. ctype.c
  135. daemon.c
  136. date.c
  137. decorate.c
  138. decorate.h
  139. delta.h
  140. diff-delta.c
  141. diff-lib.c
  142. diff-no-index.c
  143. diff.c
  144. diff.h
  145. diffcore-break.c
  146. diffcore-delta.c
  147. diffcore-order.c
  148. diffcore-pickaxe.c
  149. diffcore-rename.c
  150. diffcore.h
  151. dir.c
  152. dir.h
  153. editor.c
  154. entry.c
  155. environment.c
  156. exec_cmd.c
  157. exec_cmd.h
  158. fast-import.c
  159. fetch-pack.h
  160. fixup-builtins
  161. fsck.c
  162. fsck.h
  163. generate-cmdlist.sh
  164. git-add--interactive.perl
  165. git-am.sh
  166. git-archimport.perl
  167. git-bisect.sh
  168. git-compat-util.h
  169. git-cvsexportcommit.perl
  170. git-cvsimport.perl
  171. git-cvsserver.perl
  172. git-difftool--helper.sh
  173. git-difftool.perl
  174. git-filter-branch.sh
  175. git-instaweb.sh
  176. git-lost-found.sh
  177. git-merge-octopus.sh
  178. git-merge-one-file.sh
  179. git-merge-resolve.sh
  180. git-mergetool--lib.sh
  181. git-mergetool.sh
  182. git-parse-remote.sh
  183. git-pull.sh
  184. git-quiltimport.sh
  185. git-rebase--interactive.sh
  186. git-rebase.sh
  187. git-relink.perl
  188. git-repack.sh
  189. git-request-pull.sh
  190. git-send-email.perl
  191. git-sh-setup.sh
  192. git-stash.sh
  193. git-submodule.sh
  194. git-svn.perl
  195. GIT-VERSION-GEN
  196. git-web--browse.sh
  197. git.c
  198. git.spec.in
  199. graph.c
  200. graph.h
  201. grep.c
  202. grep.h
  203. hash-object.c
  204. hash.c
  205. hash.h
  206. help.c
  207. help.h
  208. http-push.c
  209. http-walker.c
  210. http.c
  211. http.h
  212. ident.c
  213. imap-send.c
  214. index-pack.c
  215. INSTALL
  216. levenshtein.c
  217. levenshtein.h
  218. list-objects.c
  219. list-objects.h
  220. ll-merge.c
  221. ll-merge.h
  222. lockfile.c
  223. log-tree.c
  224. log-tree.h
  225. mailmap.c
  226. mailmap.h
  227. Makefile
  228. match-trees.c
  229. merge-file.c
  230. merge-index.c
  231. merge-recursive.c
  232. merge-recursive.h
  233. merge-tree.c
  234. mktag.c
  235. mktree.c
  236. name-hash.c
  237. object.c
  238. object.h
  239. pack-check.c
  240. pack-redundant.c
  241. pack-refs.c
  242. pack-refs.h
  243. pack-revindex.c
  244. pack-revindex.h
  245. pack-write.c
  246. pack.h
  247. pager.c
  248. parse-options.c
  249. parse-options.h
  250. patch-delta.c
  251. patch-id.c
  252. patch-ids.c
  253. patch-ids.h
  254. path.c
  255. pkt-line.c
  256. pkt-line.h
  257. preload-index.c
  258. pretty.c
  259. progress.c
  260. progress.h
  261. quote.c
  262. quote.h
  263. reachable.c
  264. reachable.h
  265. read-cache.c
  266. README
  267. reflog-walk.c
  268. reflog-walk.h
  269. refs.c
  270. refs.h
  271. remote.c
  272. remote.h
  273. rerere.c
  274. rerere.h
  275. revision.c
  276. revision.h
  277. run-command.c
  278. run-command.h
  279. send-pack.h
  280. server-info.c
  281. setup.c
  282. sha1-lookup.c
  283. sha1-lookup.h
  284. sha1_file.c
  285. sha1_name.c
  286. shallow.c
  287. shell.c
  288. shortlog.h
  289. show-index.c
  290. sideband.c
  291. sideband.h
  292. sigchain.c
  293. sigchain.h
  294. strbuf.c
  295. strbuf.h
  296. string-list.c
  297. string-list.h
  298. symlinks.c
  299. tag.c
  300. tag.h
  301. tar.h
  302. test-chmtime.c
  303. test-ctype.c
  304. test-date.c
  305. test-delta.c
  306. test-dump-cache-tree.c
  307. test-genrandom.c
  308. test-match-trees.c
  309. test-parse-options.c
  310. test-path-utils.c
  311. test-sha1.c
  312. test-sha1.sh
  313. test-sigchain.c
  314. thread-utils.c
  315. thread-utils.h
  316. trace.c
  317. transport.c
  318. transport.h
  319. tree-diff.c
  320. tree-walk.c
  321. tree-walk.h
  322. tree.c
  323. tree.h
  324. unpack-file.c
  325. unpack-trees.c
  326. unpack-trees.h
  327. update-server-info.c
  328. upload-pack.c
  329. usage.c
  330. userdiff.c
  331. userdiff.h
  332. utf8.c
  333. utf8.h
  334. var.c
  335. walker.c
  336. walker.h
  337. wrapper.c
  338. write_or_die.c
  339. ws.c
  340. wt-status.c
  341. wt-status.h
  342. xdiff-interface.c
  343. xdiff-interface.h