Google Git
Sign in
googlers / jrn / git / 50753d00d691c1ea16bc72446705aee2c128fc2f
commit50753d00d691c1ea16bc72446705aee2c128fc2f[log] [tgz]
authorJeff King <peff@peff.net>Sat Mar 08 20:27:04 2008 -0800
committerJunio C Hamano <gitster@pobox.com>Sat Mar 08 21:30:05 2008 -0800
tree87599cde48d64e3298c4051f3e6eb1d32f63ca01
parent1cbcefb107776ce2da374697bb4f6e2bd22ff73f [diff]
Add a test for read-tree -u --reset with a D/F conflict

Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 file changed
tree: 87599cde48d64e3298c4051f3e6eb1d32f63ca01
  1. arm/
  2. compat/
  3. contrib/
  4. Documentation/
  5. git-gui/
  6. gitk-git/
  7. gitweb/
  8. mozilla-sha1/
  9. perl/
  10. ppc/
  11. t/
  12. templates/
  13. xdiff/
  14. RelNotes ⇨ Documentation/RelNotes-1.5.5.txt
  15. .gitattributes
  16. .gitignore
  17. .mailmap
  18. alias.c
  19. alloc.c
  20. archive-tar.c
  21. archive-zip.c
  22. archive.c
  23. archive.h
  24. attr.c
  25. attr.h
  26. base85.c
  27. blob.c
  28. blob.h
  29. branch.c
  30. branch.h
  31. builtin-add.c
  32. builtin-annotate.c
  33. builtin-apply.c
  34. builtin-archive.c
  35. builtin-blame.c
  36. builtin-branch.c
  37. builtin-bundle.c
  38. builtin-cat-file.c
  39. builtin-check-attr.c
  40. builtin-check-ref-format.c
  41. builtin-checkout-index.c
  42. builtin-checkout.c
  43. builtin-clean.c
  44. builtin-commit-tree.c
  45. builtin-commit.c
  46. builtin-config.c
  47. builtin-count-objects.c
  48. builtin-describe.c
  49. builtin-diff-files.c
  50. builtin-diff-index.c
  51. builtin-diff-tree.c
  52. builtin-diff.c
  53. builtin-fast-export.c
  54. builtin-fetch--tool.c
  55. builtin-fetch-pack.c
  56. builtin-fetch.c
  57. builtin-fmt-merge-msg.c
  58. builtin-for-each-ref.c
  59. builtin-fsck.c
  60. builtin-gc.c
  61. builtin-grep.c
  62. builtin-http-fetch.c
  63. builtin-init-db.c
  64. builtin-log.c
  65. builtin-ls-files.c
  66. builtin-ls-remote.c
  67. builtin-ls-tree.c
  68. builtin-mailinfo.c
  69. builtin-mailsplit.c
  70. builtin-merge-base.c
  71. builtin-merge-file.c
  72. builtin-merge-ours.c
  73. builtin-merge-recursive.c
  74. builtin-mv.c
  75. builtin-name-rev.c
  76. builtin-pack-objects.c
  77. builtin-pack-refs.c
  78. builtin-prune-packed.c
  79. builtin-prune.c
  80. builtin-push.c
  81. builtin-read-tree.c
  82. builtin-reflog.c
  83. builtin-rerere.c
  84. builtin-reset.c
  85. builtin-rev-list.c
  86. builtin-rev-parse.c
  87. builtin-revert.c
  88. builtin-rm.c
  89. builtin-send-pack.c
  90. builtin-shortlog.c
  91. builtin-show-branch.c
  92. builtin-show-ref.c
  93. builtin-stripspace.c
  94. builtin-symbolic-ref.c
  95. builtin-tag.c
  96. builtin-tar-tree.c
  97. builtin-unpack-objects.c
  98. builtin-update-index.c
  99. builtin-update-ref.c
  100. builtin-upload-archive.c
  101. builtin-verify-pack.c
  102. builtin-verify-tag.c
  103. builtin-write-tree.c
  104. builtin.h
  105. bundle.c
  106. bundle.h
  107. cache-tree.c
  108. cache-tree.h
  109. cache.h
  110. check-builtins.sh
  111. check-racy.c
  112. color.c
  113. color.h
  114. combine-diff.c
  115. command-list.txt
  116. commit.c
  117. commit.h
  118. config.c
  119. config.mak.in
  120. configure.ac
  121. connect.c
  122. convert.c
  123. copy.c
  124. COPYING
  125. csum-file.c
  126. csum-file.h
  127. ctype.c
  128. daemon.c
  129. date.c
  130. decorate.c
  131. decorate.h
  132. delta.h
  133. diff-delta.c
  134. diff-lib.c
  135. diff.c
  136. diff.h
  137. diffcore-break.c
  138. diffcore-delta.c
  139. diffcore-order.c
  140. diffcore-pickaxe.c
  141. diffcore-rename.c
  142. diffcore.h
  143. dir.c
  144. dir.h
  145. dump-cache-tree.c
  146. entry.c
  147. environment.c
  148. exec_cmd.c
  149. exec_cmd.h
  150. fast-import.c
  151. fetch-pack.h
  152. fixup-builtins
  153. fsck.c
  154. fsck.h
  155. generate-cmdlist.sh
  156. git-add--interactive.perl
  157. git-am.sh
  158. git-archimport.perl
  159. git-bisect.sh
  160. git-clone.sh
  161. git-compat-util.h
  162. git-cvsexportcommit.perl
  163. git-cvsimport.perl
  164. git-cvsserver.perl
  165. git-filter-branch.sh
  166. git-instaweb.sh
  167. git-lost-found.sh
  168. git-merge-octopus.sh
  169. git-merge-one-file.sh
  170. git-merge-resolve.sh
  171. git-merge-stupid.sh
  172. git-merge.sh
  173. git-mergetool.sh
  174. git-parse-remote.sh
  175. git-pull.sh
  176. git-quiltimport.sh
  177. git-rebase--interactive.sh
  178. git-rebase.sh
  179. git-relink.perl
  180. git-remote.perl
  181. git-repack.sh
  182. git-request-pull.sh
  183. git-send-email.perl
  184. git-sh-setup.sh
  185. git-stash.sh
  186. git-submodule.sh
  187. git-svn.perl
  188. GIT-VERSION-GEN
  189. git-web--browse.sh
  190. git.c
  191. git.spec.in
  192. grep.c
  193. grep.h
  194. hash-object.c
  195. hash.c
  196. hash.h
  197. help.c
  198. http-push.c
  199. http-walker.c
  200. http.c
  201. http.h
  202. ident.c
  203. imap-send.c
  204. index-pack.c
  205. INSTALL
  206. interpolate.c
  207. interpolate.h
  208. list-objects.c
  209. list-objects.h
  210. lockfile.c
  211. log-tree.c
  212. log-tree.h
  213. mailmap.c
  214. mailmap.h
  215. Makefile
  216. match-trees.c
  217. merge-file.c
  218. merge-index.c
  219. merge-recursive.h
  220. merge-tree.c
  221. mktag.c
  222. mktree.c
  223. object.c
  224. object.h
  225. pack-check.c
  226. pack-redundant.c
  227. pack-revindex.c
  228. pack-revindex.h
  229. pack-write.c
  230. pack.h
  231. pager.c
  232. parse-options.c
  233. parse-options.h
  234. patch-delta.c
  235. patch-id.c
  236. patch-ids.c
  237. patch-ids.h
  238. path-list.c
  239. path-list.h
  240. path.c
  241. pkt-line.c
  242. pkt-line.h
  243. pretty.c
  244. progress.c
  245. progress.h
  246. quote.c
  247. quote.h
  248. reachable.c
  249. reachable.h
  250. read-cache.c
  251. README
  252. receive-pack.c
  253. reflog-walk.c
  254. reflog-walk.h
  255. refs.c
  256. refs.h
  257. remote.c
  258. remote.h
  259. revision.c
  260. revision.h
  261. run-command.c
  262. run-command.h
  263. send-pack.h
  264. server-info.c
  265. setup.c
  266. sha1_file.c
  267. sha1_name.c
  268. shallow.c
  269. shell.c
  270. shortlog.h
  271. show-index.c
  272. sideband.c
  273. sideband.h
  274. strbuf.c
  275. strbuf.h
  276. symlinks.c
  277. tag.c
  278. tag.h
  279. tar.h
  280. test-absolute-path.c
  281. test-chmtime.c
  282. test-date.c
  283. test-delta.c
  284. test-genrandom.c
  285. test-match-trees.c
  286. test-parse-options.c
  287. test-sha1.c
  288. test-sha1.sh
  289. thread-utils.c
  290. thread-utils.h
  291. trace.c
  292. transport.c
  293. transport.h
  294. tree-diff.c
  295. tree-walk.c
  296. tree-walk.h
  297. tree.c
  298. tree.h
  299. unpack-file.c
  300. unpack-trees.c
  301. unpack-trees.h
  302. update-server-info.c
  303. upload-pack.c
  304. usage.c
  305. utf8.c
  306. utf8.h
  307. var.c
  308. walker.c
  309. walker.h
  310. write_or_die.c
  311. ws.c
  312. wt-status.c
  313. wt-status.h
  314. xdiff-interface.c
  315. xdiff-interface.h