Google Git
Sign in
googlers / jrn / git / 0d214b6619bf14a6409a2a1ba079f3530d40ee41
commit0d214b6619bf14a6409a2a1ba079f3530d40ee41[log] [tgz]
authorFredrik Kuivinen <freku045@student.liu.se>Tue Sep 13 23:40:23 2005 +0200
committerJunio C Hamano <junkio@cox.net>Tue Sep 13 15:45:24 2005 -0700
treec66cfbe40dba9ed56ea2c87bc0cdd7f079da63f2
parentd9a23fa6f7124befe7803f5f3a8c53999578caa4 [diff]
[PATCH] Don't output 'Automatic merge failed, ...'

git-merge.sh does this for us.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 file changed
tree: c66cfbe40dba9ed56ea2c87bc0cdd7f079da63f2
  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-grep.sh
  71. git-log.sh
  72. git-ls-remote.sh
  73. git-merge-octopus.sh
  74. git-merge-one-file.sh
  75. git-merge-recursive.py
  76. git-merge-resolve.sh
  77. git-merge-stupid.sh
  78. git-merge.sh
  79. git-octopus.sh
  80. git-parse-remote.sh
  81. git-prune.sh
  82. git-pull.sh
  83. git-push.sh
  84. git-rebase.sh
  85. git-relink.perl
  86. git-rename.perl
  87. git-repack.sh
  88. git-request-pull.sh
  89. git-reset.sh
  90. git-resolve.sh
  91. git-revert.sh
  92. git-send-email.perl
  93. git-sh-setup.sh
  94. git-shortlog.perl
  95. git-status.sh
  96. git-tag.sh
  97. git-verify-tag.sh
  98. git-whatchanged.sh
  99. git.sh
  100. gitk
  101. gitMergeCommon.py
  102. hash-object.c
  103. http-fetch.c
  104. ident.c
  105. index.c
  106. init-db.c
  107. INSTALL
  108. local-fetch.c
  109. ls-files.c
  110. ls-tree.c
  111. mailinfo.c
  112. mailsplit.c
  113. Makefile
  114. merge-base.c
  115. merge-index.c
  116. mktag.c
  117. object.c
  118. object.h
  119. pack-check.c
  120. pack-objects.c
  121. pack.h
  122. patch-delta.c
  123. patch-id.c
  124. path.c
  125. peek-remote.c
  126. pkt-line.c
  127. pkt-line.h
  128. prune-packed.c
  129. quote.c
  130. quote.h
  131. read-cache.c
  132. read-tree.c
  133. README
  134. receive-pack.c
  135. refs.c
  136. refs.h
  137. rev-cache.c
  138. rev-cache.h
  139. rev-list.c
  140. rev-parse.c
  141. rev-tree.c
  142. rsh.c
  143. rsh.h
  144. run-command.c
  145. run-command.h
  146. send-pack.c
  147. server-info.c
  148. setup.c
  149. sha1_file.c
  150. sha1_name.c
  151. show-branch.c
  152. show-index.c
  153. show-rev-cache.c
  154. ssh-fetch.c
  155. ssh-upload.c
  156. strbuf.c
  157. strbuf.h
  158. stripspace.c
  159. tag.c
  160. tag.h
  161. tar-tree.c
  162. test-date.c
  163. test-delta.c
  164. tree.c
  165. tree.h
  166. unpack-file.c
  167. unpack-objects.c
  168. update-index.c
  169. update-server-info.c
  170. upload-pack.c
  171. usage.c
  172. var.c
  173. verify-pack.c
  174. write-tree.c