diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-11-28 22:54:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-28 22:54:30 -0800 |
| commit | ffb1a4bed55534e276a0e4fc7dc1c94d17be8579 (patch) | |
| tree | 1559dc45d94b88ef584966842cbddeed08e7a256 /diff-stages.c | |
| parent | Fix typo in http-push.c (diff) | |
| download | tgif-ffb1a4bed55534e276a0e4fc7dc1c94d17be8579.tar.xz | |
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 'diff-stages.c')
0 files changed, 0 insertions, 0 deletions