Merge branch 'kh/svn'

* kh/svn:
  git-svnimport: Don't assume that copied files haven't changed
tree: 738a180e9620eb1a236c48a806e3052759eb5c24
  1. .gitignore
  2. COPYING
  3. Documentation/
  4. GIT-VERSION-GEN
  5. INSTALL
  6. Makefile
  7. README
  8. apply.c
  9. arm/
  10. blame.c
  11. blob.c
  12. blob.h
  13. cache.h
  14. cat-file.c
  15. check-ref-format.c
  16. checkout-index.c
  17. clone-pack.c
  18. combine-diff.c
  19. commit-tree.c
  20. commit.c
  21. commit.h
  22. compat/
  23. config.c
  24. connect.c
  25. contrib/
  26. convert-objects.c
  27. copy.c
  28. csum-file.c
  29. csum-file.h
  30. ctype.c
  31. daemon.c
  32. date.c
  33. delta.h
  34. describe.c
  35. diff-delta.c
  36. diff-files.c
  37. diff-index.c
  38. diff-stages.c
  39. diff-tree.c
  40. diff.c
  41. diff.h
  42. diffcore-break.c
  43. diffcore-delta.c
  44. diffcore-order.c
  45. diffcore-pathspec.c
  46. diffcore-pickaxe.c
  47. diffcore-rename.c
  48. diffcore.h
  49. entry.c
  50. environment.c
  51. exec_cmd.c
  52. exec_cmd.h
  53. fetch-clone.c
  54. fetch-pack.c
  55. fetch.c
  56. fetch.h
  57. fsck-objects.c
  58. generate-cmdlist.sh
  59. get-tar-commit-id.c
  60. git-add.sh
  61. git-am.sh
  62. git-annotate.perl
  63. git-applymbox.sh
  64. git-applypatch.sh
  65. git-archimport.perl
  66. git-bisect.sh
  67. git-branch.sh
  68. git-checkout.sh
  69. git-cherry.sh
  70. git-clean.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-whatchanged.sh
  114. git.c
  115. git.spec.in
  116. gitMergeCommon.py
  117. gitk
  118. hash-object.c
  119. http-fetch.c
  120. http-push.c
  121. http.c
  122. http.h
  123. ident.c
  124. imap-send.c
  125. index-pack.c
  126. index.c
  127. init-db.c
  128. local-fetch.c
  129. ls-files.c
  130. ls-tree.c
  131. mailinfo.c
  132. mailsplit.c
  133. merge-base.c
  134. merge-index.c
  135. merge-tree.c
  136. mktag.c
  137. mktree.c
  138. mozilla-sha1/
  139. name-rev.c
  140. object.c
  141. object.h
  142. pack-check.c
  143. pack-objects.c
  144. pack-redundant.c
  145. pack.h
  146. pager.c
  147. patch-delta.c
  148. patch-id.c
  149. path.c
  150. peek-remote.c
  151. pkt-line.c
  152. pkt-line.h
  153. ppc/
  154. prune-packed.c
  155. quote.c
  156. quote.h
  157. read-cache.c
  158. read-tree.c
  159. receive-pack.c
  160. refs.c
  161. refs.h
  162. repo-config.c
  163. rev-list.c
  164. rev-parse.c
  165. revision.c
  166. revision.h
  167. rsh.c
  168. rsh.h
  169. run-command.c
  170. run-command.h
  171. send-pack.c
  172. server-info.c
  173. setup.c
  174. sha1_file.c
  175. sha1_name.c
  176. shell.c
  177. show-branch.c
  178. show-index.c
  179. ssh-fetch.c
  180. ssh-pull.c
  181. ssh-push.c
  182. ssh-upload.c
  183. strbuf.c
  184. strbuf.h
  185. stripspace.c
  186. symbolic-ref.c
  187. t/
  188. tag.c
  189. tag.h
  190. tar-tree.c
  191. tar.h
  192. templates/
  193. test-date.c
  194. test-delta.c
  195. tree-diff.c
  196. tree-walk.c
  197. tree-walk.h
  198. tree.c
  199. tree.h
  200. unpack-file.c
  201. unpack-objects.c
  202. update-index.c
  203. update-ref.c
  204. update-server-info.c
  205. upload-pack.c
  206. usage.c
  207. var.c
  208. verify-pack.c
  209. write-tree.c
  210. xdiff-interface.c
  211. xdiff-interface.h
  212. xdiff/