commit/status: "git add <path>" is not necessarily how to resolve

When the desired resolution is to remove the path, "git rm <path>" is the
command the user needs to use.  Just like in "Changed but not updated"
section, suggest to use "git add/rm" as appropriate.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
index 7b5db8066fbb7113f4e97f2987cee6c4ed913c41..0919ec46f67d47f536c2fe68c783e02aeb384c86 100755 (executable)
--- a/t/t7060-wtstatus.sh
+++ b/t/t7060-wtstatus.sh
@@ -32,7 +32,7 @@ cat >expect <<EOF
 # On branch side
 # Unmerged paths:
 #   (use "git reset HEAD <file>..." to unstage)
 # On branch side
 # Unmerged paths:
 #   (use "git reset HEAD <file>..." to unstage)

-#   (use "git add <file>..." to mark resolution)
+#   (use "git add/rm <file>..." as appropriate to mark resolution)

 #
 #      deleted by us:      foo
 #
 #
 #      deleted by us:      foo
 #

diff --git a/wt-status.c b/wt-status.c
index 3fdcf97e1132fdcee7be9af4665a746a17933a0b..56cd8741c0ea0335f0f6e0563d69972916587cd4 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -52,7 +52,7 @@ static void wt_status_print_unmerged_header(struct wt_status *s)
                color_fprintf_ln(s->fp, c, "#   (use \"git reset %s <file>...\" to unstage)", s->reference);
        else
                color_fprintf_ln(s->fp, c, "#   (use \"git rm --cached <file>...\" to unstage)");
                color_fprintf_ln(s->fp, c, "#   (use \"git reset %s <file>...\" to unstage)", s->reference);
        else
                color_fprintf_ln(s->fp, c, "#   (use \"git rm --cached <file>...\" to unstage)");

-       color_fprintf_ln(s->fp, c, "#   (use \"git add <file>...\" to mark resolution)");
+       color_fprintf_ln(s->fp, c, "#   (use \"git add/rm <file>...\" as appropriate to mark resolution)");

        color_fprintf_ln(s->fp, c, "#");
 }
 
        color_fprintf_ln(s->fp, c, "#");
 }