projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3e2f62b) | patch
Documentation: Describe merge operation a bit better.
authorJunio C Hamano <junkio@cox.net>
Tue, 29 Nov 2005 06:54:30 +0000 (22:54 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 29 Nov 2005 06:54:30 +0000 (22:54 -0800)
commitffb1a4bed55534e276a0e4fc7dc1c94d17be8579
tree1559dc45d94b88ef584966842cbddeed08e7a256tree | snapshot
parent3e2f62bebfe8e9aeea63849c37c65f25ea001e65commit | diff
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>
Documentation/git-merge.txt diff | blob | history
The core git plumbing