Google Git
Sign in
googlers / jrn / git / a1184d85e8752658f02746982822f43f32316803
commita1184d85e8752658f02746982822f43f32316803[log] [tgz]
authorJunio C Hamano <gitster@pobox.com>Wed Aug 27 17:28:31 2008 -0700
committerJunio C Hamano <gitster@pobox.com>Wed Aug 27 17:28:31 2008 -0700
treef4508ca7d63ca7e71c3e99cac4e54945f777b1aa
parent8d13caf795902812d44809e2f222fb2334030603 [diff]
parente596cdddf349b244dca854bf5a7aa9428b48fc50 [diff]
Merge branch 'mv/merge-custom'

* mv/merge-custom:
  t7606: fix custom merge test
  Fix "git-merge -s bogo" help text
  Update .gitignore to ignore git-help
  Builtin git-help.
  builtin-help: always load_command_list() in cmd_help()
  Add a second testcase for handling invalid strategies in git-merge
  Add a new test for using a custom merge strategy
  builtin-merge: allow using a custom strategy
  builtin-help: make some internal functions available to other builtins

Conflicts:
	help.c
tree: f4508ca7d63ca7e71c3e99cac4e54945f777b1aa
  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.1.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-reflog.c
  87. builtin-remote.c
  88. builtin-rerere.c
  89. builtin-reset.c
  90. builtin-rev-list.c
  91. builtin-rev-parse.c
  92. builtin-revert.c
  93. builtin-rm.c
  94. builtin-send-pack.c
  95. builtin-shortlog.c
  96. builtin-show-branch.c
  97. builtin-show-ref.c
  98. builtin-stripspace.c
  99. builtin-symbolic-ref.c
  100. builtin-tag.c
  101. builtin-tar-tree.c
  102. builtin-unpack-objects.c
  103. builtin-update-index.c
  104. builtin-update-ref.c
  105. builtin-upload-archive.c
  106. builtin-verify-pack.c
  107. builtin-verify-tag.c
  108. builtin-write-tree.c
  109. builtin.h
  110. bundle.c
  111. bundle.h
  112. cache-tree.c
  113. cache-tree.h
  114. cache.h
  115. check-builtins.sh
  116. check-racy.c
  117. check_bindir
  118. color.c
  119. color.h
  120. combine-diff.c
  121. command-list.txt
  122. commit.c
  123. commit.h
  124. config.c
  125. config.mak.in
  126. configure.ac
  127. connect.c
  128. convert.c
  129. copy.c
  130. COPYING
  131. csum-file.c
  132. csum-file.h
  133. ctype.c
  134. daemon.c
  135. date.c
  136. decorate.c
  137. decorate.h
  138. delta.h
  139. diff-delta.c
  140. diff-lib.c
  141. diff-no-index.c
  142. diff.c
  143. diff.h
  144. diffcore-break.c
  145. diffcore-delta.c
  146. diffcore-order.c
  147. diffcore-pickaxe.c
  148. diffcore-rename.c
  149. diffcore.h
  150. dir.c
  151. dir.h
  152. dump-cache-tree.c
  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-filter-branch.sh
  173. git-instaweb.sh
  174. git-lost-found.sh
  175. git-merge-octopus.sh
  176. git-merge-one-file.sh
  177. git-merge-resolve.sh
  178. git-mergetool.sh
  179. git-parse-remote.sh
  180. git-pull.sh
  181. git-quiltimport.sh
  182. git-rebase--interactive.sh
  183. git-rebase.sh
  184. git-relink.perl
  185. git-repack.sh
  186. git-request-pull.sh
  187. git-send-email.perl
  188. git-sh-setup.sh
  189. git-stash.sh
  190. git-submodule.sh
  191. git-svn.perl
  192. GIT-VERSION-GEN
  193. git-web--browse.sh
  194. git.c
  195. git.spec.in
  196. graph.c
  197. graph.h
  198. grep.c
  199. grep.h
  200. hash-object.c
  201. hash.c
  202. hash.h
  203. help.c
  204. help.h
  205. http-push.c
  206. http-walker.c
  207. http.c
  208. http.h
  209. ident.c
  210. imap-send.c
  211. index-pack.c
  212. INSTALL
  213. interpolate.c
  214. interpolate.h
  215. list-objects.c
  216. list-objects.h
  217. ll-merge.c
  218. ll-merge.h
  219. lockfile.c
  220. log-tree.c
  221. log-tree.h
  222. mailmap.c
  223. mailmap.h
  224. Makefile
  225. match-trees.c
  226. merge-file.c
  227. merge-index.c
  228. merge-recursive.h
  229. merge-tree.c
  230. mktag.c
  231. mktree.c
  232. name-hash.c
  233. object.c
  234. object.h
  235. pack-check.c
  236. pack-redundant.c
  237. pack-refs.c
  238. pack-refs.h
  239. pack-revindex.c
  240. pack-revindex.h
  241. pack-write.c
  242. pack.h
  243. pager.c
  244. parse-options.c
  245. parse-options.h
  246. patch-delta.c
  247. patch-id.c
  248. patch-ids.c
  249. patch-ids.h
  250. path.c
  251. pkt-line.c
  252. pkt-line.h
  253. pretty.c
  254. progress.c
  255. progress.h
  256. quote.c
  257. quote.h
  258. reachable.c
  259. reachable.h
  260. read-cache.c
  261. README
  262. receive-pack.c
  263. reflog-walk.c
  264. reflog-walk.h
  265. refs.c
  266. refs.h
  267. remote.c
  268. remote.h
  269. rerere.c
  270. rerere.h
  271. revision.c
  272. revision.h
  273. run-command.c
  274. run-command.h
  275. send-pack.h
  276. server-info.c
  277. setup.c
  278. sha1-lookup.c
  279. sha1-lookup.h
  280. sha1_file.c
  281. sha1_name.c
  282. shallow.c
  283. shell.c
  284. shortlog.h
  285. show-index.c
  286. sideband.c
  287. sideband.h
  288. strbuf.c
  289. strbuf.h
  290. string-list.c
  291. string-list.h
  292. symlinks.c
  293. tag.c
  294. tag.h
  295. tar.h
  296. test-chmtime.c
  297. test-date.c
  298. test-delta.c
  299. test-genrandom.c
  300. test-match-trees.c
  301. test-parse-options.c
  302. test-path-utils.c
  303. test-sha1.c
  304. test-sha1.sh
  305. thread-utils.c
  306. thread-utils.h
  307. trace.c
  308. transport.c
  309. transport.h
  310. tree-diff.c
  311. tree-walk.c
  312. tree-walk.h
  313. tree.c
  314. tree.h
  315. unpack-file.c
  316. unpack-trees.c
  317. unpack-trees.h
  318. update-server-info.c
  319. upload-pack.c
  320. usage.c
  321. utf8.c
  322. utf8.h
  323. var.c
  324. walker.c
  325. walker.h
  326. wrapper.c
  327. write_or_die.c
  328. ws.c
  329. wt-status.c
  330. wt-status.h
  331. xdiff-interface.c
  332. xdiff-interface.h