Google Git
Sign in
code/git/3d89cb4f3f5333d5eb5899352566ad071dbd0d0c
commit
3d89cb4f3f5333d5eb5899352566ad071dbd0d0c
[log]
author
Daniel Barkalow <barkalow@iabervon.org>
Mon Sep 05 02:05:17 2005 -0400
committer
Junio C Hamano <junkio@cox.net>
Sat Sep 10 18:27:41 2005 -0700
tree
4839378eb41288eaacc91dc12ab9f9e6b8233747
parent
ee6566e8d70da682ac4926dd8a67ac821b2c1743 [diff]
[PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.

Signed-off-by: Daniel Barkalow
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 file changed
tree: 4839378eb41288eaacc91dc12ab9f9e6b8233747
  1. debian/
  2. Documentation/
  3. mozilla-sha1/
  4. ppc/
  5. t/
  6. templates/
  7. .gitignore
  8. apply.c
  9. blob.c
  10. blob.h
  11. build-rev-cache.c
  12. cache.h
  13. cat-file.c
  14. checkout-index.c
  15. clone-pack.c
  16. cmd-rename.sh
  17. commit-tree.c
  18. commit.c
  19. commit.h
  20. connect.c
  21. convert-objects.c
  22. COPYING
  23. count-delta.c
  24. count-delta.h
  25. csum-file.c
  26. csum-file.h
  27. daemon.c
  28. date.c
  29. delta.h
  30. diff-delta.c
  31. diff-files.c
  32. diff-helper.c
  33. diff-index.c
  34. diff-stages.c
  35. diff-tree.c
  36. diff.c
  37. diff.h
  38. diffcore-break.c
  39. diffcore-order.c
  40. diffcore-pathspec.c
  41. diffcore-pickaxe.c
  42. diffcore-rename.c
  43. diffcore.h
  44. entry.c
  45. epoch.c
  46. epoch.h
  47. export.c
  48. fetch-pack.c
  49. fetch.c
  50. fetch.h
  51. fsck-objects.c
  52. get-tar-commit-id.c
  53. git-add.sh
  54. git-applymbox.sh
  55. git-applypatch.sh
  56. git-archimport.perl
  57. git-bisect.sh
  58. git-branch.sh
  59. git-checkout.sh
  60. git-cherry.sh
  61. git-clone.sh
  62. git-commit.sh
  63. git-core.spec.in
  64. git-count-objects.sh
  65. git-cvsimport.perl
  66. git-diff.sh
  67. git-external-diff-script
  68. git-fetch.sh
  69. git-format-patch.sh
  70. git-log.sh
  71. git-ls-remote.sh
  72. git-merge-one-file.sh
  73. git-octopus.sh
  74. git-parse-remote.sh
  75. git-prune.sh
  76. git-pull.sh
  77. git-push.sh
  78. git-rebase.sh
  79. git-relink.perl
  80. git-rename.perl
  81. git-repack.sh
  82. git-request-pull.sh
  83. git-reset.sh
  84. git-resolve.sh
  85. git-revert.sh
  86. git-send-email.perl
  87. git-sh-setup.sh
  88. git-shortlog.perl
  89. git-status.sh
  90. git-tag.sh
  91. git-verify-tag.sh
  92. git-whatchanged.sh
  93. git.sh
  94. gitk
  95. hash-object.c
  96. http-fetch.c
  97. ident.c
  98. index.c
  99. init-db.c
  100. INSTALL
  101. local-fetch.c
  102. ls-files.c
  103. ls-tree.c
  104. mailinfo.c
  105. mailsplit.c
  106. Makefile
  107. merge-base.c
  108. merge-index.c
  109. mktag.c
  110. object.c
  111. object.h
  112. pack-check.c
  113. pack-objects.c
  114. pack.h
  115. patch-delta.c
  116. patch-id.c
  117. path.c
  118. peek-remote.c
  119. pkt-line.c
  120. pkt-line.h
  121. prune-packed.c
  122. quote.c
  123. quote.h
  124. read-cache.c
  125. read-tree.c
  126. README
  127. receive-pack.c
  128. refs.c
  129. refs.h
  130. rev-cache.c
  131. rev-cache.h
  132. rev-list.c
  133. rev-parse.c
  134. rev-tree.c
  135. rsh.c
  136. rsh.h
  137. run-command.c
  138. run-command.h
  139. send-pack.c
  140. server-info.c
  141. setup.c
  142. sha1_file.c
  143. sha1_name.c
  144. show-branch.c
  145. show-index.c
  146. show-rev-cache.c
  147. ssh-fetch.c
  148. ssh-upload.c
  149. strbuf.c
  150. strbuf.h
  151. stripspace.c
  152. tag.c
  153. tag.h
  154. tar-tree.c
  155. test-date.c
  156. test-delta.c
  157. tree.c
  158. tree.h
  159. unpack-file.c
  160. unpack-objects.c
  161. update-index.c
  162. update-server-info.c
  163. upload-pack.c
  164. usage.c
  165. var.c
  166. verify-pack.c
  167. write-tree.c