From: Mark Dominus <mjd@plover.com>
To: git@vger.kernel.org, gitster@pobox.com
Cc: Mark Dominus <mjd@icgroup.com>, Mark Dominus <mjd@plover.com>
Subject: [PATCH] document 'T' status from git-status
Date: Sat, 29 Oct 2011 20:06:44 -0400 [thread overview]
Message-ID: <1319933204-21587-1-git-send-email-mjd@plover.com> (raw)
From: Mark Dominus <mjd@icgroup.com>
Signed-off-by: Mark Dominus <mjd@plover.com>
---
Documentation/git-status.txt | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 3d51717..e7fc5c3 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -122,6 +122,8 @@ codes can be interpreted as follows:
* 'R' = renamed
* 'C' = copied
* 'U' = updated but unmerged
+* 'T' = file type changed
+ (typically from plain file to symlink, or vice versa)
Ignored files are not listed, unless `--ignored` option is in effect,
in which case `XY` are `!!`.
@@ -134,9 +136,11 @@ in which case `XY` are `!!`.
D [ M] deleted from index
R [ MD] renamed in index
C [ MD] copied in index
+ T [ MD] file type changed in index
[MARC] index and work tree matches
[ MARC] M work tree changed since index
[ MARC] D deleted in work tree
+ [ MARC] T file type changed in work tree
-------------------------------------------------
D D unmerged, both deleted
A U unmerged, added by us
--
1.7.7.dirty
next reply other threads:[~2011-10-30 0:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-30 0:06 Mark Dominus [this message]
2011-10-30 6:25 ` [PATCH] document 'T' status from git-status Junio C Hamano
2011-10-30 20:34 ` Mark Dominus
2011-10-31 4:18 ` Junio C Hamano
2011-10-31 14:04 ` Mark Dominus
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=1319933204-21587-1-git-send-email-mjd@plover.com \
--to=mjd@plover.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mjd@icgroup.com \
/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;
as well as URLs for NNTP newsgroup(s).