diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-02 12:02:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-02 12:02:16 -0700 |
| commit | 9d52f15af7de943779cf6302cef4f1a88ce447be (patch) | |
| tree | 53c0f1a56674b66491cd0e6942fca82b5a1968e9 /Documentation/git-ls-files.txt | |
| parent | 8a883b0260ba7f8d6e4c025ae3c32b454e80ade5 (diff) | |
| parent | 7d808125a0197e5660a57f77d14937604b16e39a (diff) | |
| download | git-9d52f15af7de943779cf6302cef4f1a88ce447be.tar.gz | |
Merge branch 'maint'
* maint:
test-lib: Remove 3 year old no-op --no-python option
test-lib: Ignore --quiet under a TAP harness
Documentation/rev-parse: quoting is required with --parseopt
Documentation: reporting bugs
Fix git rebase --continue to work with touched files
Document ls-files -t as semi-obsolete.
Diffstat (limited to 'Documentation/git-ls-files.txt')
| -rw-r--r-- | Documentation/git-ls-files.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index 3521637b58..bd919f2dfd 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -106,8 +106,16 @@ OPTIONS with `-s` or `-u` options does not make any sense. -t:: - Identify the file status with the following tags (followed by - a space) at the start of each line: + This feature is semi-deprecated. For scripting purpose, + linkgit:git-status[1] `--porcelain` and + linkgit:git-diff-files[1] `--name-status` are almost always + superior alternatives, and users should look at + linkgit:git-status[1] `--short` or linkgit:git-diff[1] + `--name-status` for more user-friendly alternatives. ++ +This option identifies the file status with the following tags (followed by +a space) at the start of each line: + H:: cached S:: skip-worktree M:: unmerged |