Google Git
Sign in
googlers / jrn / git / b6f0621a462e4ff11999c8e2d8279c0ffd3be201
commitb6f0621a462e4ff11999c8e2d8279c0ffd3be201[log] [tgz]
authorDavid Aguilar <davvid@gmail.com>Sun May 24 00:24:41 2009 +0000
committerJunio C Hamano <gitster@pobox.com>Sun May 24 11:21:05 2009 -0700
treec054ccc5f9f12c8db69de036c9d868a458ca2d48
parent4481ff048df4c86021d783de6f099909495f04ff [diff]
mergetool--lib: add support for araxis merge

Araxis merge is now a built-in diff/merge tool.
This adds araxis to git-completion and updates
the documentation to mention araxis.

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