Google Git
Sign in
code / git / d249b455475977f305240bb73473f25d040012cf
commitd249b455475977f305240bb73473f25d040012cf[log] [tgz]
authorUwe Zeisberger <Uwe_Zeisberger@digi.com>Fri Aug 04 10:11:15 2006 +0200
committerJunio C Hamano <junkio@cox.net>Fri Aug 04 02:08:02 2006 -0700
treec6be092cb75597eccaa42164e1c2320666c015f8
parentcba05fa840b637db2708014142a753680d930082 [diff]
Document rev-list's option --merge

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