Google Git
Sign in
googlers / jrn / git / 4a164d48df6bb1b4a771741c63d4437fd2dca0bb
commit4a164d48df6bb1b4a771741c63d4437fd2dca0bb[log] [tgz]
authorJunio C Hamano <junkio@cox.net>Tue Feb 13 16:50:32 2007 -0800
committerJunio C Hamano <junkio@cox.net>Tue Feb 13 16:54:35 2007 -0800
tree73e3b0ca16e8ea83e9f761af476736c29b24caf9
parentf8f2aaa17297d6b21c84641edc2f6135575a003c [diff]
parent03840fc32d783be6750bf7e41a89687b8c3053eb [diff]
Merge branch 'jc/merge-base' (early part)

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