Google Git
Sign in
code / git / eb3359663d62f35999330797455dbe738bd5ed99
commiteb3359663d62f35999330797455dbe738bd5ed99[log] [tgz]
authorJunio C Hamano <junkio@cox.net>Tue Apr 03 16:28:46 2007 -0700
committerJunio C Hamano <junkio@cox.net>Tue Apr 03 19:01:36 2007 -0700
treead96b70ce6f5834453867fa4dbd422cc767c09a8
parent3ac53e0d13fa7483cce90eb6a1cfcdcbda5b8e35 [diff]
rerere should not repeat the earlier hunks in later ones

When a file has more then one conflicting hunks, it repeated the
contents of previous hunks in output for later ones.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2 files changed
tree: ad96b70ce6f5834453867fa4dbd422cc767c09a8
  1. arm/
  2. compat/
  3. contrib/
  4. Documentation/
  5. git-gui/
  6. gitweb/
  7. mozilla-sha1/
  8. perl/
  9. ppc/
  10. t/
  11. templates/
  12. xdiff/
  13. RelNotes ⇨ Documentation/RelNotes-1.5.0.6.txt
  14. .gitignore
  15. .mailmap
  16. alloc.c
  17. archive-tar.c
  18. archive-zip.c
  19. archive.h
  20. base85.c
  21. blob.c
  22. blob.h
  23. builtin-add.c
  24. builtin-annotate.c
  25. builtin-apply.c
  26. builtin-archive.c
  27. builtin-blame.c
  28. builtin-branch.c
  29. builtin-cat-file.c
  30. builtin-check-ref-format.c
  31. builtin-checkout-index.c
  32. builtin-commit-tree.c
  33. builtin-config.c
  34. builtin-count-objects.c
  35. builtin-describe.c
  36. builtin-diff-files.c
  37. builtin-diff-index.c
  38. builtin-diff-stages.c
  39. builtin-diff-tree.c
  40. builtin-diff.c
  41. builtin-fmt-merge-msg.c
  42. builtin-for-each-ref.c
  43. builtin-fsck.c
  44. builtin-grep.c
  45. builtin-init-db.c
  46. builtin-log.c
  47. builtin-ls-files.c
  48. builtin-ls-tree.c
  49. builtin-mailinfo.c
  50. builtin-mailsplit.c
  51. builtin-merge-file.c
  52. builtin-mv.c
  53. builtin-name-rev.c
  54. builtin-pack-objects.c
  55. builtin-pack-refs.c
  56. builtin-prune-packed.c
  57. builtin-prune.c
  58. builtin-push.c
  59. builtin-read-tree.c
  60. builtin-reflog.c
  61. builtin-rerere.c
  62. builtin-rev-list.c
  63. builtin-rev-parse.c
  64. builtin-rm.c
  65. builtin-runstatus.c
  66. builtin-shortlog.c
  67. builtin-show-branch.c
  68. builtin-show-ref.c
  69. builtin-stripspace.c
  70. builtin-symbolic-ref.c
  71. builtin-tar-tree.c
  72. builtin-unpack-objects.c
  73. builtin-update-index.c
  74. builtin-update-ref.c
  75. builtin-upload-archive.c
  76. builtin-verify-pack.c
  77. builtin-write-tree.c
  78. builtin.h
  79. cache-tree.c
  80. cache-tree.h
  81. cache.h
  82. check-builtins.sh
  83. check-racy.c
  84. color.c
  85. color.h
  86. combine-diff.c
  87. commit.c
  88. commit.h
  89. config.c
  90. config.mak.in
  91. configure.ac
  92. connect.c
  93. convert-objects.c
  94. copy.c
  95. COPYING
  96. csum-file.c
  97. csum-file.h
  98. ctype.c
  99. daemon.c
  100. date.c
  101. delta.h
  102. diff-delta.c
  103. diff-lib.c
  104. diff.c
  105. diff.h
  106. diffcore-break.c
  107. diffcore-delta.c
  108. diffcore-order.c
  109. diffcore-pickaxe.c
  110. diffcore-rename.c
  111. diffcore.h
  112. dir.c
  113. dir.h
  114. dump-cache-tree.c
  115. entry.c
  116. environment.c
  117. exec_cmd.c
  118. exec_cmd.h
  119. fast-import.c
  120. fetch-pack.c
  121. fetch.c
  122. fetch.h
  123. generate-cmdlist.sh
  124. git-add--interactive.perl
  125. git-am.sh
  126. git-applymbox.sh
  127. git-applypatch.sh
  128. git-archimport.perl
  129. git-bisect.sh
  130. git-checkout.sh
  131. git-clean.sh
  132. git-clone.sh
  133. git-commit.sh
  134. git-compat-util.h
  135. git-cvsexportcommit.perl
  136. git-cvsimport.perl
  137. git-cvsserver.perl
  138. git-fetch.sh
  139. git-gc.sh
  140. git-instaweb.sh
  141. git-lost-found.sh
  142. git-ls-remote.sh
  143. git-merge-octopus.sh
  144. git-merge-one-file.sh
  145. git-merge-ours.sh
  146. git-merge-resolve.sh
  147. git-merge-stupid.sh
  148. git-merge.sh
  149. git-p4import.py
  150. git-parse-remote.sh
  151. git-pull.sh
  152. git-quiltimport.sh
  153. git-rebase.sh
  154. git-relink.perl
  155. git-remote.perl
  156. git-repack.sh
  157. git-request-pull.sh
  158. git-reset.sh
  159. git-resolve.sh
  160. git-revert.sh
  161. git-send-email.perl
  162. git-sh-setup.sh
  163. git-svn.perl
  164. git-svnimport.perl
  165. git-tag.sh
  166. git-verify-tag.sh
  167. GIT-VERSION-GEN
  168. git.c
  169. git.spec.in
  170. gitk
  171. grep.c
  172. grep.h
  173. hash-object.c
  174. help.c
  175. http-fetch.c
  176. http-push.c
  177. http.c
  178. http.h
  179. ident.c
  180. imap-send.c
  181. index-pack.c
  182. INSTALL
  183. interpolate.c
  184. interpolate.h
  185. list-objects.c
  186. list-objects.h
  187. local-fetch.c
  188. lockfile.c
  189. log-tree.c
  190. log-tree.h
  191. Makefile
  192. merge-base.c
  193. merge-file.c
  194. merge-index.c
  195. merge-recursive.c
  196. merge-tree.c
  197. mktag.c
  198. mktree.c
  199. object-refs.c
  200. object.c
  201. object.h
  202. pack-check.c
  203. pack-redundant.c
  204. pack.h
  205. pager.c
  206. patch-delta.c
  207. patch-id.c
  208. path-list.c
  209. path-list.h
  210. path.c
  211. peek-remote.c
  212. pkt-line.c
  213. pkt-line.h
  214. quote.c
  215. quote.h
  216. reachable.c
  217. reachable.h
  218. read-cache.c
  219. README
  220. receive-pack.c
  221. reflog-walk.c
  222. reflog-walk.h
  223. refs.c
  224. refs.h
  225. revision.c
  226. revision.h
  227. rsh.c
  228. rsh.h
  229. run-command.c
  230. run-command.h
  231. send-pack.c
  232. server-info.c
  233. setup.c
  234. sha1_file.c
  235. sha1_name.c
  236. shallow.c
  237. shell.c
  238. show-index.c
  239. sideband.c
  240. sideband.h
  241. ssh-fetch.c
  242. ssh-pull.c
  243. ssh-push.c
  244. ssh-upload.c
  245. strbuf.c
  246. strbuf.h
  247. tag.c
  248. tag.h
  249. tar.h
  250. test-date.c
  251. test-delta.c
  252. test-sha1.c
  253. test-sha1.sh
  254. trace.c
  255. tree-diff.c
  256. tree-walk.c
  257. tree-walk.h
  258. tree.c
  259. tree.h
  260. unpack-file.c
  261. unpack-trees.c
  262. unpack-trees.h
  263. update-server-info.c
  264. upload-pack.c
  265. usage.c
  266. utf8.c
  267. utf8.h
  268. var.c
  269. write_or_die.c
  270. wt-status.c
  271. wt-status.h
  272. xdiff-interface.c
  273. xdiff-interface.h