| commit | 4c371f91270792791f867d15f25b03f800ab35a1 | |
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | |
| Sun, 22 Nov 2009 22:26:17 +0000 (22 23:26 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 23 Nov 2009 00:07:27 +0000 (22 16:07 -0800) | ||
| tree | 8ca2bd7efa1e7801039ed90faeb13706d235b492 | treesnapshot (tar.gz zip) |
| parent | 78d553b7d7b269bb22ebd8b1198657c37484a3a0 | commitdiff |
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>
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 | diffblobblamehistory | |
| advice.c | diffblobblamehistory | |
| advice.h | diffblobblamehistory | |
| merge-recursive.c | diffblobblamehistory |