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 /t | |
| parent | commit/status: check $GIT_DIR/MERGE_HEAD only once (diff) | |
| download | tgif-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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7060-wtstatus.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh index 7b5db8066f..0919ec46f6 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 # |