Google GitGoogle Git
Sign in
code/git/4209752da5a2e327e470493618931a7abbf0a381
commit
4209752da5a2e327e470493618931a7abbf0a381
[log]
author
Junio C Hamano <gitster@pobox.com>
Thu Jun 12 14:30:37 2008 -0700
committer
Junio C Hamano <gitster@pobox.com>
Thu Jun 12 14:30:51 2008 -0700
tree
02bc98317f3e7355eab1983b4f3568a37bdb0975
parent
9501fc894566f4d27a9823407555f3039273162c [diff]
user-manual: describe how higher stages are set during a merge

Higher stages store the blobs involved from their side verbatim.  Removal
of uninteresting hunks are done by "diff --cc" upon demand and not stored
in the index.

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