Google Git
Sign in
googlers / jrn / git / 3f1c70f717da3c9ec6ae3744593c7f9f3729aad7
commit3f1c70f717da3c9ec6ae3744593c7f9f3729aad7[log] [tgz]
authorJunio C Hamano <gitster@pobox.com>Thu Aug 25 16:00:43 2011 -0700
committerJunio C Hamano <gitster@pobox.com>Thu Aug 25 16:00:43 2011 -0700
tree2ae895eba594851c845af80b4d60cd584e59f0b6
parent9bf0eedd1d789fecbc9959e2c2122d34c123863c [diff]
parentf61bd9c68a4ed81afcc1fbbf5b956e781d88b434 [diff]
Merge branch 'da/difftool-mergtool-refactor'

* da/difftool-mergtool-refactor:
  mergetools/meld: Use '--output' when available
  mergetool--lib: Refactor tools into separate files
  mergetool--lib: Make style consistent with git
  difftool--helper: Make style consistent with git
tree: 2ae895eba594851c845af80b4d60cd584e59f0b6
  1. block-sha1/
  2. builtin/
  3. compat/
  4. contrib/
  5. Documentation/
  6. git-gui/
  7. git_remote_helpers/
  8. gitk-git/
  9. gitweb/
  10. mergetools/
  11. perl/
  12. po/
  13. ppc/
  14. t/
  15. templates/
  16. vcs-svn/
  17. xdiff/
  18. RelNotes ⇨ Documentation/RelNotes/1.7.7.txt
  19. .gitattributes
  20. .gitignore
  21. .mailmap
  22. abspath.c
  23. aclocal.m4
  24. advice.c
  25. advice.h
  26. alias.c
  27. alloc.c
  28. archive-tar.c
  29. archive-zip.c
  30. archive.c
  31. archive.h
  32. attr.c
  33. attr.h
  34. base85.c
  35. bisect.c
  36. bisect.h
  37. blob.c
  38. blob.h
  39. branch.c
  40. branch.h
  41. builtin.h
  42. bundle.c
  43. bundle.h
  44. cache-tree.c
  45. cache-tree.h
  46. cache.h
  47. check-builtins.sh
  48. check-racy.c
  49. check_bindir
  50. color.c
  51. color.h
  52. combine-diff.c
  53. command-list.txt
  54. commit.c
  55. commit.h
  56. config.c
  57. config.mak.in
  58. configure.ac
  59. connect.c
  60. convert.c
  61. convert.h
  62. copy.c
  63. COPYING
  64. csum-file.c
  65. csum-file.h
  66. ctype.c
  67. daemon.c
  68. date.c
  69. decorate.c
  70. decorate.h
  71. delta.h
  72. diff-delta.c
  73. diff-lib.c
  74. diff-no-index.c
  75. diff.c
  76. diff.h
  77. diffcore-break.c
  78. diffcore-delta.c
  79. diffcore-order.c
  80. diffcore-pickaxe.c
  81. diffcore-rename.c
  82. diffcore.h
  83. dir.c
  84. dir.h
  85. editor.c
  86. entry.c
  87. environment.c
  88. exec_cmd.c
  89. exec_cmd.h
  90. fast-import.c
  91. fetch-pack.h
  92. fixup-builtins
  93. fsck.c
  94. fsck.h
  95. generate-cmdlist.sh
  96. gettext.c
  97. gettext.h
  98. git-add--interactive.perl
  99. git-am.sh
  100. git-archimport.perl
  101. git-bisect.sh
  102. git-compat-util.h
  103. git-cvsexportcommit.perl
  104. git-cvsimport.perl
  105. git-cvsserver.perl
  106. git-difftool--helper.sh
  107. git-difftool.perl
  108. git-filter-branch.sh
  109. git-instaweb.sh
  110. git-lost-found.sh
  111. git-merge-octopus.sh
  112. git-merge-one-file.sh
  113. git-merge-resolve.sh
  114. git-mergetool--lib.sh
  115. git-mergetool.sh
  116. git-parse-remote.sh
  117. git-pull.sh
  118. git-quiltimport.sh
  119. git-rebase--am.sh
  120. git-rebase--interactive.sh
  121. git-rebase--merge.sh
  122. git-rebase.sh
  123. git-relink.perl
  124. git-remote-testgit.py
  125. git-repack.sh
  126. git-request-pull.sh
  127. git-send-email.perl
  128. git-sh-i18n.sh
  129. git-sh-setup.sh
  130. git-stash.sh
  131. git-submodule.sh
  132. git-svn.perl
  133. GIT-VERSION-GEN
  134. git-web--browse.sh
  135. git.c
  136. git.spec.in
  137. graph.c
  138. graph.h
  139. grep.c
  140. grep.h
  141. hash.c
  142. hash.h
  143. help.c
  144. help.h
  145. hex.c
  146. http-backend.c
  147. http-fetch.c
  148. http-push.c
  149. http-walker.c
  150. http.c
  151. http.h
  152. ident.c
  153. imap-send.c
  154. INSTALL
  155. levenshtein.c
  156. levenshtein.h
  157. LGPL-2.1
  158. list-objects.c
  159. list-objects.h
  160. ll-merge.c
  161. ll-merge.h
  162. lockfile.c
  163. log-tree.c
  164. log-tree.h
  165. mailmap.c
  166. mailmap.h
  167. Makefile
  168. match-trees.c
  169. merge-file.c
  170. merge-file.h
  171. merge-recursive.c
  172. merge-recursive.h
  173. name-hash.c
  174. notes-cache.c
  175. notes-cache.h
  176. notes-merge.c
  177. notes-merge.h
  178. notes.c
  179. notes.h
  180. object.c
  181. object.h
  182. pack-check.c
  183. pack-refs.c
  184. pack-refs.h
  185. pack-revindex.c
  186. pack-revindex.h
  187. pack-write.c
  188. pack.h
  189. pager.c
  190. parse-options-cb.c
  191. parse-options.c
  192. parse-options.h
  193. patch-delta.c
  194. patch-ids.c
  195. patch-ids.h
  196. path.c
  197. pkt-line.c
  198. pkt-line.h
  199. preload-index.c
  200. pretty.c
  201. progress.c
  202. progress.h
  203. quote.c
  204. quote.h
  205. reachable.c
  206. reachable.h
  207. read-cache.c
  208. README
  209. reflog-walk.c
  210. reflog-walk.h
  211. refs.c
  212. refs.h
  213. remote-curl.c
  214. remote.c
  215. remote.h
  216. replace_object.c
  217. rerere.c
  218. rerere.h
  219. resolve-undo.c
  220. resolve-undo.h
  221. revision.c
  222. revision.h
  223. run-command.c
  224. run-command.h
  225. send-pack.h
  226. server-info.c
  227. setup.c
  228. sh-i18n--envsubst.c
  229. sha1-array.c
  230. sha1-array.h
  231. sha1-lookup.c
  232. sha1-lookup.h
  233. sha1_file.c
  234. sha1_name.c
  235. shallow.c
  236. shell.c
  237. shortlog.h
  238. show-index.c
  239. sideband.c
  240. sideband.h
  241. sigchain.c
  242. sigchain.h
  243. strbuf.c
  244. strbuf.h
  245. streaming.c
  246. streaming.h
  247. string-list.c
  248. string-list.h
  249. submodule.c
  250. submodule.h
  251. symlinks.c
  252. tag.c
  253. tag.h
  254. tar.h
  255. test-chmtime.c
  256. test-ctype.c
  257. test-date.c
  258. test-delta.c
  259. test-dump-cache-tree.c
  260. test-genrandom.c
  261. test-index-version.c
  262. test-line-buffer.c
  263. test-match-trees.c
  264. test-mktemp.c
  265. test-obj-pool.c
  266. test-parse-options.c
  267. test-path-utils.c
  268. test-run-command.c
  269. test-sha1.c
  270. test-sha1.sh
  271. test-sigchain.c
  272. test-string-pool.c
  273. test-subprocess.c
  274. test-svn-fe.c
  275. test-treap.c
  276. thread-utils.c
  277. thread-utils.h
  278. trace.c
  279. transport-helper.c
  280. transport.c
  281. transport.h
  282. tree-diff.c
  283. tree-walk.c
  284. tree-walk.h
  285. tree.c
  286. tree.h
  287. unimplemented.sh
  288. unpack-trees.c
  289. unpack-trees.h
  290. upload-pack.c
  291. url.c
  292. url.h
  293. usage.c
  294. userdiff.c
  295. userdiff.h
  296. utf8.c
  297. utf8.h
  298. walker.c
  299. walker.h
  300. wrap-for-bin.sh
  301. wrapper.c
  302. write_or_die.c
  303. ws.c
  304. wt-status.c
  305. wt-status.h
  306. xdiff-interface.c
  307. xdiff-interface.h
  308. zlib.c