From: Junio C Hamano <junkio@cox.net>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: Brian Gerst <bgerst@didntduck.org>, git@vger.kernel.org
Subject: Re: [PATCH] Show modified files in git-ls-files
Date: Fri, 02 Sep 2005 02:28:54 -0700 [thread overview]
Message-ID: <7v3bonkecp.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <tnxzmqvalie.fsf@arm.com> (Catalin Marinas's message of "Fri, 02 Sep 2005 10:04:25 +0100")
Catalin Marinas <catalin.marinas@gmail.com> writes:
> Brian Gerst <bgerst@didntduck.org> wrote:
>> Add -m/--modified to show files that have been modified wrt. the index.
>>
>> M was already taken so the tag for modifified files is C (changed).
>
> I think git-ls-files should be consistent with git-diff-cache where M
> means modified and U unmerged (but for the former, M is unmerged).
>
> StGIT currently uses C to report a merge conflict but I will probably
> change this since it means copied in git-diff-cache.
I think that is an excellent suggestion. It looks to me that
the tag feature in ls-files needs serious renaming.
* an option is called --deleted and the variable to control the
output is show_deleted; the tag variable and string is
removed and "R". Probably the tag should be renamed to "D".
* before "modified", tag_cached was OK, but probably "known to
git" would have been a better name. I'd vote for just a
single space " " as the tag letter; if we want to use printing
character, then a single dot ".". Most of the things are
"known to git" anyway so these are visually less
distracting.
* unmerged should be "U" as you say.
next prev parent reply other threads:[~2005-09-02 9:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-02 0:35 [PATCH] Show modified files in git-ls-files Brian Gerst
2005-09-02 9:04 ` Catalin Marinas
2005-09-02 9:28 ` Junio C Hamano [this message]
2005-09-02 12:17 ` Brian Gerst
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v3bonkecp.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=bgerst@didntduck.org \
--cc=catalin.marinas@gmail.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).