From f1790448628262e46496861bb6da76be63a2a247 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 6 Nov 2005 17:37:40 -0800 Subject: [PATCH] git-status: do not mark unmerged paths as committable. An unmerged path appears as both "Updated but not checked in" list, and "Changed but not updated" list. We are not going to commit that path until it is resolved, so remove it from the former list. Signed-off-by: Junio C Hamano --- git-status.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-status.sh b/git-status.sh index 62a24a9b03..837f334d87 100755 --- a/git-status.sh +++ b/git-status.sh @@ -41,7 +41,7 @@ git-update-index -q --unmerged --refresh || exit if GIT_DIR="$GIT_DIR" git-rev-parse --verify HEAD >/dev/null 2>&1 then - git-diff-index -M --cached --name-status HEAD | + git-diff-index -M --cached --name-status --diff-filter=MDTCRA HEAD | sed -e ' s/\\/\\\\/g s/ /\\ /g -- 2.11.4.GIT