projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4c371f9) | patch
user-manual: Document that "git merge" doesn't like uncommited changes.
authorMatthieu Moy <Matthieu.Moy@imag.fr>
Sun, 22 Nov 2009 22:26:18 +0000 (23:26 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Nov 2009 00:07:28 +0000 (16:07 -0800)
commite63ec003b2a0c89f0c1cbc4862dcef7c4a14a785
tree8d4aa3ed37aab9242f2bf4192c86d2991d6f23f8tree | snapshot
parent4c371f91270792791f867d15f25b03f800ab35a1commit | diff
user-manual: Document that "git merge" doesn't like uncommited changes.

We explain the user why uncommited changes can be problematic with merge,
and point to "commit" and "stash" for the solution. While talking about
commited Vs uncommited changes, we also make it clear that the result of
a merge is normally commited.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/user-manual.txt diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.