diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-12 23:30:37 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-12 23:30:51 +0200 |
| commit | 4209752da5a2e327e470493618931a7abbf0a381 (patch) | |
| tree | 02bc98317f3e7355eab1983b4f3568a37bdb0975 /git-submodule.sh | |
| parent | doc: adding gitman.info and *.texi to .gitignore (diff) | |
| download | git-4209752da5a2e327e470493618931a7abbf0a381.tar.xz git-4209752da5a2e327e470493618931a7abbf0a381.zip | |
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>
Diffstat (limited to 'git-submodule.sh')
0 files changed, 0 insertions, 0 deletions