Google Git
Sign in
googlers / jrn / git / 3827210b91a7d363ea67bcf0b9c6ee1c91d2f3c5
commit3827210b91a7d363ea67bcf0b9c6ee1c91d2f3c5[log] [tgz]
authorJunio C Hamano <gitster@pobox.com>Thu Jan 01 05:48:40 2009 -0800
committerJunio C Hamano <gitster@pobox.com>Thu Jan 01 05:48:40 2009 -0800
treed142cd6449c93a48abd928ddeb809d23c952d08f
parent42e778bfec68d251b777c6b8444cda4bc51332be [diff]
parent162eba8b43a0e665c8e3439191981412815cc6db [diff]
Merge branch 'cb/mergetool'

* cb/mergetool:
  mergetool: Don't keep temporary merge files unless told to
  mergetool: Add prompt to continue after failing to merge a file
  Add -y/--no-prompt option to mergetool
  Fix some tab/space inconsistencies in git-mergetool.sh
tree: d142cd6449c93a48abd928ddeb809d23c952d08f
  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.2.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. dump-cache-tree.c
  154. editor.c
  155. entry.c
  156. environment.c
  157. exec_cmd.c
  158. exec_cmd.h
  159. fast-import.c
  160. fetch-pack.h
  161. fixup-builtins
  162. fsck.c
  163. fsck.h
  164. generate-cmdlist.sh
  165. git-add--interactive.perl
  166. git-am.sh
  167. git-archimport.perl
  168. git-bisect.sh
  169. git-compat-util.h
  170. git-cvsexportcommit.perl
  171. git-cvsimport.perl
  172. git-cvsserver.perl
  173. git-filter-branch.sh
  174. git-instaweb.sh
  175. git-lost-found.sh
  176. git-merge-octopus.sh
  177. git-merge-one-file.sh
  178. git-merge-resolve.sh
  179. git-mergetool.sh
  180. git-parse-remote.sh
  181. git-pull.sh
  182. git-quiltimport.sh
  183. git-rebase--interactive.sh
  184. git-rebase.sh
  185. git-relink.perl
  186. git-repack.sh
  187. git-request-pull.sh
  188. git-send-email.perl
  189. git-sh-setup.sh
  190. git-stash.sh
  191. git-submodule.sh
  192. git-svn.perl
  193. GIT-VERSION-GEN
  194. git-web--browse.sh
  195. git.c
  196. git.spec.in
  197. graph.c
  198. graph.h
  199. grep.c
  200. grep.h
  201. hash-object.c
  202. hash.c
  203. hash.h
  204. help.c
  205. help.h
  206. http-push.c
  207. http-walker.c
  208. http.c
  209. http.h
  210. ident.c
  211. imap-send.c
  212. index-pack.c
  213. INSTALL
  214. levenshtein.c
  215. levenshtein.h
  216. list-objects.c
  217. list-objects.h
  218. ll-merge.c
  219. ll-merge.h
  220. lockfile.c
  221. log-tree.c
  222. log-tree.h
  223. mailmap.c
  224. mailmap.h
  225. Makefile
  226. match-trees.c
  227. merge-file.c
  228. merge-index.c
  229. merge-recursive.c
  230. merge-recursive.h
  231. merge-tree.c
  232. mktag.c
  233. mktree.c
  234. name-hash.c
  235. object.c
  236. object.h
  237. pack-check.c
  238. pack-redundant.c
  239. pack-refs.c
  240. pack-refs.h
  241. pack-revindex.c
  242. pack-revindex.h
  243. pack-write.c
  244. pack.h
  245. pager.c
  246. parse-options.c
  247. parse-options.h
  248. patch-delta.c
  249. patch-id.c
  250. patch-ids.c
  251. patch-ids.h
  252. path.c
  253. pkt-line.c
  254. pkt-line.h
  255. preload-index.c
  256. pretty.c
  257. progress.c
  258. progress.h
  259. quote.c
  260. quote.h
  261. reachable.c
  262. reachable.h
  263. read-cache.c
  264. README
  265. reflog-walk.c
  266. reflog-walk.h
  267. refs.c
  268. refs.h
  269. remote.c
  270. remote.h
  271. rerere.c
  272. rerere.h
  273. revision.c
  274. revision.h
  275. run-command.c
  276. run-command.h
  277. send-pack.h
  278. server-info.c
  279. setup.c
  280. sha1-lookup.c
  281. sha1-lookup.h
  282. sha1_file.c
  283. sha1_name.c
  284. shallow.c
  285. shell.c
  286. shortlog.h
  287. show-index.c
  288. sideband.c
  289. sideband.h
  290. strbuf.c
  291. strbuf.h
  292. string-list.c
  293. string-list.h
  294. symlinks.c
  295. tag.c
  296. tag.h
  297. tar.h
  298. test-chmtime.c
  299. test-date.c
  300. test-delta.c
  301. test-genrandom.c
  302. test-match-trees.c
  303. test-parse-options.c
  304. test-path-utils.c
  305. test-sha1.c
  306. test-sha1.sh
  307. thread-utils.c
  308. thread-utils.h
  309. trace.c
  310. transport.c
  311. transport.h
  312. tree-diff.c
  313. tree-walk.c
  314. tree-walk.h
  315. tree.c
  316. tree.h
  317. unpack-file.c
  318. unpack-trees.c
  319. unpack-trees.h
  320. update-server-info.c
  321. upload-pack.c
  322. usage.c
  323. userdiff.c
  324. userdiff.h
  325. utf8.c
  326. utf8.h
  327. var.c
  328. walker.c
  329. walker.h
  330. wrapper.c
  331. write_or_die.c
  332. ws.c
  333. wt-status.c
  334. wt-status.h
  335. xdiff-interface.c
  336. xdiff-interface.h