Google Git
Sign in
googlers / jrn / git / 6db41050a360d83e89114602ecc81c208323080f
commit6db41050a360d83e89114602ecc81c208323080f[log] [tgz]
authorJunio C Hamano <gitster@pobox.com>Thu May 19 20:17:44 2011 -0700
committerJunio C Hamano <gitster@pobox.com>Thu May 19 20:33:38 2011 -0700
tree7a9f293d1cb3441cb34fec70cfd0a307302c21a3
parentd192508cd6867059ccc4ce0946ec1110028dad37 [diff]
Revert "Merge branch 'en/merge-recursive'"

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