X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-ls-files.html;h=315c00240245838c19cef708ab966d5978dcfcc0;hb=4220baa7b77d7e965a9cdd61e21d114f6ba66c21;hp=ed81380b308cbc003ef1fcee0478e52704704906;hpb=7e9f6b7094a99335837f79e33c7723ff516dc53b;p=git.git diff --git a/git-ls-files.html b/git-ls-files.html index ed81380b..315c0024 100644 --- a/git-ls-files.html +++ b/git-ls-files.html @@ -280,7 +280,7 @@ git-ls-files(1) Manual Page [-X <file>|--exclude-from=<file>] [--exclude-per-directory=<file>] [--error-unmatch] - [--full-name] [--] [<file>]* + [--full-name] [--abbrev] [--] [<file>]*

DESCRIPTION

@@ -352,6 +352,14 @@ shown:

+--no-empty-directory +
+
+

+ Do not list empty directories. Has no effect without --directory. +

+
+
-u|--unmerged
@@ -492,7 +500,17 @@ other

-— +--abbrev[=<n>] +
+
+

+ Instead of showing the full 40-byte hexadecimal object + lines, show only handful hexdigits prefix. + Non default number of digits can be specified with --abbrev=<n>. +

+
+
+--

@@ -610,8 +628,7 @@ an optional prefix ! which means that the fate this pattern

if it does not contain a slash /, it is a shell glob pattern and used to match against the filename without - leading directories (i.e. the same way as the current - implementation). + leading directories.

  • @@ -641,6 +658,17 @@ otherwise, it is a shell glob pattern, suitable for --exclude-from=.git/ignore \ --exclude-per-directory=.gitignore
    • +

    Another example:

    +
    +
    +
        $ cat .gitignore
+    vmlinux*
+    $ ls arch/foo/kernel/vm*
+    arch/foo/kernel/vmlinux.lds.S
+    $ echo '!/vmlinux*' >arch/foo/kernel/.gitignore
    +
    +

    The second .gitignore keeps arch/foo/kernel/vmlinux.lds.S file +from getting ignored.

    See Also

    @@ -660,7 +688,7 @@ otherwise, it is a shell glob pattern, suitable for