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>
Junio C Hamano committed
Dec 12, 2009 at 00:18 UTC
dd20f8af1ae54773569b78b1b71d1ea663705d2c
2 files changed
+2
-2
t/t7060-wtstatus.sh
+1
-1
@@ -32,7 +32,7 @@ cat >expect <<EOF
32
# On branch side
33
# Unmerged paths:
34
# (use "git reset HEAD <file>..." to unstage)
35
-# (use "git add <file>..." to mark resolution)
35
+# (use "git add/rm <file>..." as appropriate to mark resolution)
36
#
37
# deleted by us: foo
38
#
wt-status.c
+1
-1
@@ -52,7 +52,7 @@ static void wt_status_print_unmerged_header(struct wt_status *s)
52
color_fprintf_ln(s->fp, c, "# (use \"git reset %s <file>...\" to unstage)", s->reference);
53
else
54
color_fprintf_ln(s->fp, c, "# (use \"git rm --cached <file>...\" to unstage)");
55
- color_fprintf_ln(s->fp, c, "# (use \"git add <file>...\" to mark resolution)");
55
+ color_fprintf_ln(s->fp, c, "# (use \"git add/rm <file>...\" as appropriate to mark resolution)");
56
color_fprintf_ln(s->fp, c, "#");
57
}
58