X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-ls-files.txt;h=98f3b9e7589cd810d0bc04f08e84dd057039e258;hb=73d66323ac78c750ba42fef23b1cb8fd2110e023;hp=057a021eb50899ed5fe1ee5a7b6c59e7fc27becf;hpb=c5034673fd92b6278e6c9d55683770ec01fafc89;p=git.git diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index 057a021eb..98f3b9e75 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -44,12 +44,14 @@ OPTIONS -o:: --others:: - Show other files in the output + Show other (i.e. untracked) files in the output -i:: --ignored:: - Show ignored files in the output. - Note that this also reverses any exclude list present. + Show only ignored files in the output. When showing files in the + index, print only those matched by an exclude pattern. When + showing "other" files, show only those matched by an exclude + pattern. -s:: --stage:: @@ -107,6 +109,7 @@ OPTIONS Identify the file status with the following tags (followed by a space) at the start of each line: H:: cached + S:: skip-worktree M:: unmerged R:: removed/deleted C:: modified/changed