| commit | 23cbf11b5c08c6d0ab0fd0d6f2dc5a32ca31c745 | |
| author | Diane Gasselin <diane.gasselin@ensimag.imag.fr> | |
| Wed, 11 Aug 2010 08:38:05 +0000 (11 10:38 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 Aug 2010 17:36:03 +0000 (11 10:36 -0700) | ||
| tree | 61c94915e74e7118388bcc5bb1422eadf2a83bfe | treesnapshot (tar.gz zip) |
| parent | 08353ebbab2dfdee50a6daa616ec8b6483cb07c8 | commitdiff |
merge-recursive: porcelain messages for checkout
A porcelain message was first added in checkout.c in the commit
8ccba008 (Junio C Hamano, Sat May 17 21:03:49 2008, unpack-trees:
allow Porcelain to give different error messages) to give better feedback
in the case of merge errors.
This patch adapts the porcelain messages for the case of checkout
instead. This way, when having a checkout error, "merge" no longer
appears in the error message.
While we're there, we add an advice in the case of
would_lose_untracked_file.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
A porcelain message was first added in checkout.c in the commit
8ccba008 (Junio C Hamano, Sat May 17 21:03:49 2008, unpack-trees:
allow Porcelain to give different error messages) to give better feedback
in the case of merge errors.
This patch adapts the porcelain messages for the case of checkout
instead. This way, when having a checkout error, "merge" no longer
appears in the error message.
While we're there, we add an advice in the case of
would_lose_untracked_file.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/checkout.c | diffblobblamehistory | |
| builtin/merge.c | diffblobblamehistory | |
| merge-recursive.c | diffblobblamehistory | |
| merge-recursive.h | diffblobblamehistory | |
| unpack-trees.c | diffblobblamehistory |