From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 12 Dec 2009 08:18:12 +0000 (-0800)
Subject: commit/status: "git add <path>" is not necessarily how to resolve
X-Git-Tag: v1.7.0-rc0~137^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dd20f8af1ae54773569b78b1b71d1ea663705d2c;p=git.git

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 7b5db8066..0919ec46f 100755
--- 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)
-#   (use "git add <file>..." to mark resolution)
+#   (use "git add/rm <file>..." as appropriate to mark resolution)
 #
 #	deleted by us:      foo
 #
diff --git a/wt-status.c b/wt-status.c
index 3fdcf97e1..56cd8741c 100644
--- 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 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, "#");
 }