summaryrefslogtreecommitdiff
path: root/tree.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-29 06:54:30 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-29 06:54:30 (GMT)
commitffb1a4bed55534e276a0e4fc7dc1c94d17be8579 (patch)
tree1559dc45d94b88ef584966842cbddeed08e7a256 /tree.h
parent3e2f62bebfe8e9aeea63849c37c65f25ea001e65 (diff)
downloadgit-ffb1a4bed55534e276a0e4fc7dc1c94d17be8579.zip
git-ffb1a4bed55534e276a0e4fc7dc1c94d17be8579.tar.gz
git-ffb1a4bed55534e276a0e4fc7dc1c94d17be8579.tar.bz2
Documentation: Describe merge operation a bit better.
In git-merge documentation, add a section to describe what happens to the index and working tree during merge, and what their cleanliness requirements are before the merge. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'tree.h')
0 files changed, 0 insertions, 0 deletions