Google Git
Sign in
googlers / jrn / git / 731651fe25a7d7a242584e4b85112a610c32a23f
commit731651fe25a7d7a242584e4b85112a610c32a23f[log] [tgz]
authorJunio C Hamano <junkio@cox.net>Sat Jun 03 23:58:26 2006 -0700
committerJunio C Hamano <junkio@cox.net>Sat Jun 03 23:58:26 2006 -0700
tree4f075c7c075b5f14f752484993ece4d077e29df5
parentb0d6e64629aeba96e837972c0fda5e61eebb7ab1 [diff]
parent65160b8b04f814ab5b2573b32605320ff875f99e [diff]
Merge branch 'ff/svnimport'

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