Google Git
Sign in
code/git/cdb63506a0d632b4bf81378756b53f30d7198b50
commit
cdb63506a0d632b4bf81378756b53f30d7198b50
[log]
author
Junio C Hamano <junkio@cox.net>
Mon Apr 24 02:05:55 2006 -0700
committer
Junio C Hamano <junkio@cox.net>
Mon Apr 24 02:05:55 2006 -0700
tree
c1c2be58674fe2bd3423f670dcf646212e471ded
parent
3a403e49b90ff30e3253a6a66e8e7cc3a1d33c8f [diff]
parent
2bd452d3b9f62ecc3406307cd6a5553856d21ff2 [diff]
Merge branch 'jc/unresolve'

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