Google Git
Sign in
googlers / jrn / git / 2cd861672e1021012f40597b9b68cc3a9af62e10
commit2cd861672e1021012f40597b9b68cc3a9af62e10[log] [tgz]
authorJunio C Hamano <gitster@pobox.com>Thu Feb 13 13:38:59 2014 -0800
committerJunio C Hamano <gitster@pobox.com>Thu Feb 13 13:38:59 2014 -0800
tree5638bb031b32cb06df4ec87ff8066c2ca48cd7c9
parent5032098614b6f68258d1f5d13615b9dcbf25f040 [diff]
parent8f29299136c2f11730d876cd62637a9e37d4c388 [diff]
Merge branch 'bm/merge-base-octopus-dedup' into maint

"git merge-base --octopus" used to leave cleaning up suboptimal
result to the caller, but now it does the clean-up itself.

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