[PATCH 2/3] commit/status: "git add <path>" is not necessarily how to resolve
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 12, 2009, 09:02 UTC
- Message-ID
- <1260608523-15579-3-git-send-email-gitster@pobox.com>
- In-Reply-To
- <1260608523-15579-2-git-send-email-gitster@pobox.com>
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> --- t/t7060-wtstatus.sh | 2 +- wt-status.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh index 7b5db80..6c1af26 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 appropriately to mark resolution) # # deleted by us: foo # diff --git a/wt-status.c b/wt-status.c index 3fdcf97..5271b6a 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 appropriately to mark resolution)"); color_fprintf_ln(s->fp, c, "#"); }
-- 1.6.6.rc2.5.g49666