diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-12 00:18:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-12 01:21:38 -0800 |
| commit | dd20f8af1ae54773569b78b1b71d1ea663705d2c (patch) | |
| tree | afeb7ae1fcf77dd5ca599d3d88baa7df6b25bc1f | |
| parent | 309883015ff3af6ce14ff9fe401e06cfce8adb13 (diff) | |
| download | git-dd20f8af1ae54773569b78b1b71d1ea663705d2c.tar.gz git-dd20f8af1ae54773569b78b1b71d1ea663705d2c.tar.xz | |
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>
| -rwxr-xr-x | t/t7060-wtstatus.sh | 2 | ||||
| -rw-r--r-- | wt-status.c | 2 |
2 files changed, 2 insertions, 2 deletions
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, "#"); } |