]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 78d553b) | patch
merge-recursive: point the user to commit when file would be overwritten.
authorMatthieu Moy <Matthieu.Moy@imag.fr>
Sun, 22 Nov 2009 22:26:17 +0000 (23:26 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Nov 2009 00:07:27 +0000 (16:07 -0800)
commit4c371f91270792791f867d15f25b03f800ab35a1
tree8ca2bd7efa1e7801039ed90faeb13706d235b492tree | snapshot
parent78d553b7d7b269bb22ebd8b1198657c37484a3a0commit | diff
merge-recursive: point the user to commit when file would be overwritten.

The commit-before-pull is well accepted in the DVCS community, but is
confusing some new users. This should get them back in the right way when
the problem occurs.

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