From: Junio C Hamano <junkio@cox.net>
To: git@vger.kernel.org
Subject: git-status: do not mark unmerged paths as committable.
Date: Sun, 06 Nov 2005 17:39:06 -0800 [thread overview]
Message-ID: <7vslu9uthh.fsf@assigned-by-dhcp.cox.net> (raw)
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 <junkio@cox.net>
---
git-status.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
applies-to: 49ac95e5ebfd28b32ec1a23a0982900426f0c06c
f1790448628262e46496861bb6da76be63a2a247
diff --git a/git-status.sh b/git-status.sh
index 62a24a9..837f334 100755
--- a/git-status.sh
+++ b/git-status.sh
@@ -41,7 +41,7 @@ git-update-index -q --unmerged --refresh
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
---
0.99.9.GIT
reply other threads:[~2005-11-07 1:39 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vslu9uthh.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox