Google Git
Sign in
googlers / jrn / git / a541211ef4136eb7464c4466d20b60b8580efc44
commita541211ef4136eb7464c4466d20b60b8580efc44[log] [tgz]
authorMatthias Urlichs <smurf@smurf.noris.de>Tue Mar 07 10:08:34 2006 +0100
committerJunio C Hamano <junkio@cox.net>Tue Mar 07 17:00:45 2006 -0800
tree2fbc96fdd90494f9bbc054880794440ac2613b1a
parent2dcdb4c69737185f0b0e9fe08ba52b95b84f13da [diff]
cvsimport: Remove master-updating code

The code which tried to update the master branch was somewhat broken.
=> People should do that manually, with "git merge".

Signed-off-by: Matthias Urlichs <smurf@smurf.noris.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2 files changed
tree: 2fbc96fdd90494f9bbc054880794440ac2613b1a
  1. arm/
  2. compat/
  3. contrib/
  4. Documentation/
  5. mozilla-sha1/
  6. ppc/
  7. t/
  8. templates/
  9. .gitignore
  10. apply.c
  11. blame.c
  12. blob.c
  13. blob.h
  14. cache.h
  15. cat-file.c
  16. check-ref-format.c
  17. checkout-index.c
  18. clone-pack.c
  19. combine-diff.c
  20. commit-tree.c
  21. commit.c
  22. commit.h
  23. config.c
  24. connect.c
  25. convert-objects.c
  26. copy.c
  27. COPYING
  28. count-delta.c
  29. count-delta.h
  30. csum-file.c
  31. csum-file.h
  32. ctype.c
  33. daemon.c
  34. date.c
  35. delta.h
  36. describe.c
  37. diff-delta.c
  38. diff-files.c
  39. diff-index.c
  40. diff-stages.c
  41. diff-tree.c
  42. diff.c
  43. diff.h
  44. diffcore-break.c
  45. diffcore-delta.c
  46. diffcore-order.c
  47. diffcore-pathspec.c
  48. diffcore-pickaxe.c
  49. diffcore-rename.c
  50. diffcore.h
  51. entry.c
  52. environment.c
  53. exec_cmd.c
  54. exec_cmd.h
  55. fetch-clone.c
  56. fetch-pack.c
  57. fetch.c
  58. fetch.h
  59. fsck-objects.c
  60. get-tar-commit-id.c
  61. git-add.sh
  62. git-am.sh
  63. git-annotate.perl
  64. git-applymbox.sh
  65. git-applypatch.sh
  66. git-archimport.perl
  67. git-bisect.sh
  68. git-branch.sh
  69. git-checkout.sh
  70. git-cherry.sh
  71. git-clone.sh
  72. git-commit.sh
  73. git-compat-util.h
  74. git-count-objects.sh
  75. git-cvsexportcommit.perl
  76. git-cvsimport.perl
  77. git-cvsserver.perl
  78. git-diff.sh
  79. git-fetch.sh
  80. git-fmt-merge-msg.perl
  81. git-format-patch.sh
  82. git-grep.sh
  83. git-log.sh
  84. git-lost-found.sh
  85. git-ls-remote.sh
  86. git-merge-octopus.sh
  87. git-merge-one-file.sh
  88. git-merge-ours.sh
  89. git-merge-recursive.py
  90. git-merge-resolve.sh
  91. git-merge-stupid.sh
  92. git-merge.sh
  93. git-mv.perl
  94. git-parse-remote.sh
  95. git-prune.sh
  96. git-pull.sh
  97. git-push.sh
  98. git-rebase.sh
  99. git-relink.perl
  100. git-repack.sh
  101. git-request-pull.sh
  102. git-rerere.perl
  103. git-reset.sh
  104. git-resolve.sh
  105. git-revert.sh
  106. git-rm.sh
  107. git-send-email.perl
  108. git-sh-setup.sh
  109. git-shortlog.perl
  110. git-svnimport.perl
  111. git-tag.sh
  112. git-verify-tag.sh
  113. GIT-VERSION-GEN
  114. git-whatchanged.sh
  115. git.c
  116. git.spec.in
  117. gitk
  118. gitMergeCommon.py
  119. hash-object.c
  120. http-fetch.c
  121. http-push.c
  122. http.c
  123. http.h
  124. ident.c
  125. index-pack.c
  126. index.c
  127. init-db.c
  128. INSTALL
  129. local-fetch.c
  130. ls-files.c
  131. ls-tree.c
  132. mailinfo.c
  133. mailsplit.c
  134. Makefile
  135. merge-base.c
  136. merge-index.c
  137. merge-tree.c
  138. mktag.c
  139. mktree.c
  140. name-rev.c
  141. object.c
  142. object.h
  143. pack-check.c
  144. pack-objects.c
  145. pack-redundant.c
  146. pack.h
  147. pager.c
  148. patch-delta.c
  149. patch-id.c
  150. path.c
  151. peek-remote.c
  152. pkt-line.c
  153. pkt-line.h
  154. prune-packed.c
  155. quote.c
  156. quote.h
  157. read-cache.c
  158. read-tree.c
  159. README
  160. receive-pack.c
  161. refs.c
  162. refs.h
  163. repo-config.c
  164. rev-list.c
  165. rev-parse.c
  166. revision.c
  167. revision.h
  168. rsh.c
  169. rsh.h
  170. run-command.c
  171. run-command.h
  172. send-pack.c
  173. server-info.c
  174. setup.c
  175. sha1_file.c
  176. sha1_name.c
  177. shell.c
  178. show-branch.c
  179. show-index.c
  180. ssh-fetch.c
  181. ssh-pull.c
  182. ssh-push.c
  183. ssh-upload.c
  184. strbuf.c
  185. strbuf.h
  186. stripspace.c
  187. symbolic-ref.c
  188. tag.c
  189. tag.h
  190. tar-tree.c
  191. test-date.c
  192. test-delta.c
  193. tree-diff.c
  194. tree.c
  195. tree.h
  196. unpack-file.c
  197. unpack-objects.c
  198. update-index.c
  199. update-ref.c
  200. update-server-info.c
  201. upload-pack.c
  202. usage.c
  203. var.c
  204. verify-pack.c
  205. write-tree.c