projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9501fc8) | patch
user-manual: describe how higher stages are set during a merge
authorJunio C Hamano <gitster@pobox.com>
Thu, 12 Jun 2008 21:30:37 +0000 (14:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 12 Jun 2008 21:30:51 +0000 (14:30 -0700)
commit4209752da5a2e327e470493618931a7abbf0a381
tree02bc98317f3e7355eab1983b4f3568a37bdb0975tree | snapshot
parent9501fc894566f4d27a9823407555f3039273162ccommit | 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>
Documentation/user-manual.txt diff | blob | history
Git—the stupid content tracker