2005-05-10 21:32:30 +00:00
|
|
|
git-ls-files(1)
|
|
|
|
===============
|
|
|
|
|
|
|
|
NAME
|
|
|
|
----
|
2007-01-18 23:53:37 +00:00
|
|
|
git-ls-files - Show information about files in the index and the working tree
|
2005-05-10 21:32:30 +00:00
|
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
--------
|
2006-02-12 09:48:47 +00:00
|
|
|
[verse]
|
2017-09-22 16:35:41 +00:00
|
|
|
'git ls-files' [-z] [-t] [-v] [-f]
|
2022-11-06 07:37:27 +00:00
|
|
|
[-c|--cached] [-d|--deleted] [-o|--others] [-i|--ignored]
|
|
|
|
[-s|--stage] [-u|--unmerged] [-k|--killed] [-m|--modified]
|
2023-01-13 04:41:51 +00:00
|
|
|
[--resolve-undo]
|
2021-11-06 18:48:53 +00:00
|
|
|
[--directory [--no-empty-directory]] [--eol]
|
2021-01-23 10:20:10 +00:00
|
|
|
[--deduplicate]
|
2005-05-10 21:32:30 +00:00
|
|
|
[-x <pattern>|--exclude=<pattern>]
|
|
|
|
[-X <file>|--exclude-from=<file>]
|
2006-03-07 19:59:17 +00:00
|
|
|
[--exclude-per-directory=<file>]
|
2007-11-15 07:04:30 +00:00
|
|
|
[--exclude-standard]
|
2007-09-14 23:59:04 +00:00
|
|
|
[--error-unmatch] [--with-tree=<tree-ish>]
|
2016-10-07 18:18:49 +00:00
|
|
|
[--full-name] [--recurse-submodules]
|
2022-07-23 06:44:45 +00:00
|
|
|
[--abbrev[=<n>]] [--format=<format>] [--] [<file>...]
|
2005-05-10 21:32:30 +00:00
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
-----------
|
2023-10-08 06:45:03 +00:00
|
|
|
This command merges the file listing in the index with the actual working
|
2021-01-08 16:54:56 +00:00
|
|
|
directory list, and shows different combinations of the two.
|
2005-05-10 21:32:30 +00:00
|
|
|
|
2023-10-08 06:45:03 +00:00
|
|
|
Several flags can be used to determine which files are
|
ls-files: clarify descriptions of file selection options
The previous descriptions of the file selection options were very easy
to misunderstand. For example:
* "Show cached files in the output"
This could be interpreted as meaning "show files which have been
modified and git-add'ed, i.e. files which have cached changes
relative to HEAD".
* "Show deleted files"
This could be interpreted as meaning "for each `git rm $FILE` we
ran, show me $FILE"
* "Show modified files"
This could be interpreted as meaning "show files which have been
modified and git-add'ed" or as "show me files that differ from HEAD"
or as "show me undeleted files different from HEAD" (given that
--deleted is a separate option), none of which are correct.
Further, it's not very clear when some options only modify and/or
override other options, as was the case with --ignored, --directory, and
--unmerged (I've seen folks confused by each of them on the mailing
list, sometimes even fellow git developers.)
Tweak these definitions, and the one for --killed, to try to make them
all a bit more clear. Finally, also clarify early on that duplicate
reports for paths are often expected (both when (a) there are multiple
entries for the file in the index -- i.e. when there are conflicts, and
also (b) when the user specifies options that might pick the same file
multiple times, such as `git ls-files --cached --deleted --modified`
when there is a file with an unstaged deletion).
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-01-13 04:41:52 +00:00
|
|
|
shown, and each file may be printed multiple times if there are
|
2023-10-08 06:45:03 +00:00
|
|
|
multiple entries in the index or if multiple statuses are applicable for
|
ls-files: clarify descriptions of file selection options
The previous descriptions of the file selection options were very easy
to misunderstand. For example:
* "Show cached files in the output"
This could be interpreted as meaning "show files which have been
modified and git-add'ed, i.e. files which have cached changes
relative to HEAD".
* "Show deleted files"
This could be interpreted as meaning "for each `git rm $FILE` we
ran, show me $FILE"
* "Show modified files"
This could be interpreted as meaning "show files which have been
modified and git-add'ed" or as "show me files that differ from HEAD"
or as "show me undeleted files different from HEAD" (given that
--deleted is a separate option), none of which are correct.
Further, it's not very clear when some options only modify and/or
override other options, as was the case with --ignored, --directory, and
--unmerged (I've seen folks confused by each of them on the mailing
list, sometimes even fellow git developers.)
Tweak these definitions, and the one for --killed, to try to make them
all a bit more clear. Finally, also clarify early on that duplicate
reports for paths are often expected (both when (a) there are multiple
entries for the file in the index -- i.e. when there are conflicts, and
also (b) when the user specifies options that might pick the same file
multiple times, such as `git ls-files --cached --deleted --modified`
when there is a file with an unstaged deletion).
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-01-13 04:41:52 +00:00
|
|
|
the relevant file selection options.
|
2005-05-10 21:32:30 +00:00
|
|
|
|
|
|
|
OPTIONS
|
|
|
|
-------
|
2008-06-08 01:36:09 +00:00
|
|
|
-c::
|
|
|
|
--cached::
|
ls-files: clarify descriptions of file selection options
The previous descriptions of the file selection options were very easy
to misunderstand. For example:
* "Show cached files in the output"
This could be interpreted as meaning "show files which have been
modified and git-add'ed, i.e. files which have cached changes
relative to HEAD".
* "Show deleted files"
This could be interpreted as meaning "for each `git rm $FILE` we
ran, show me $FILE"
* "Show modified files"
This could be interpreted as meaning "show files which have been
modified and git-add'ed" or as "show me files that differ from HEAD"
or as "show me undeleted files different from HEAD" (given that
--deleted is a separate option), none of which are correct.
Further, it's not very clear when some options only modify and/or
override other options, as was the case with --ignored, --directory, and
--unmerged (I've seen folks confused by each of them on the mailing
list, sometimes even fellow git developers.)
Tweak these definitions, and the one for --killed, to try to make them
all a bit more clear. Finally, also clarify early on that duplicate
reports for paths are often expected (both when (a) there are multiple
entries for the file in the index -- i.e. when there are conflicts, and
also (b) when the user specifies options that might pick the same file
multiple times, such as `git ls-files --cached --deleted --modified`
when there is a file with an unstaged deletion).
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-01-13 04:41:52 +00:00
|
|
|
Show all files cached in Git's index, i.e. all tracked files.
|
|
|
|
(This is the default if no -c/-s/-d/-o/-u/-k/-m/--resolve-undo
|
|
|
|
options are specified.)
|
2005-05-10 21:32:30 +00:00
|
|
|
|
2008-06-08 01:36:09 +00:00
|
|
|
-d::
|
|
|
|
--deleted::
|
ls-files: clarify descriptions of file selection options
The previous descriptions of the file selection options were very easy
to misunderstand. For example:
* "Show cached files in the output"
This could be interpreted as meaning "show files which have been
modified and git-add'ed, i.e. files which have cached changes
relative to HEAD".
* "Show deleted files"
This could be interpreted as meaning "for each `git rm $FILE` we
ran, show me $FILE"
* "Show modified files"
This could be interpreted as meaning "show files which have been
modified and git-add'ed" or as "show me files that differ from HEAD"
or as "show me undeleted files different from HEAD" (given that
--deleted is a separate option), none of which are correct.
Further, it's not very clear when some options only modify and/or
override other options, as was the case with --ignored, --directory, and
--unmerged (I've seen folks confused by each of them on the mailing
list, sometimes even fellow git developers.)
Tweak these definitions, and the one for --killed, to try to make them
all a bit more clear. Finally, also clarify early on that duplicate
reports for paths are often expected (both when (a) there are multiple
entries for the file in the index -- i.e. when there are conflicts, and
also (b) when the user specifies options that might pick the same file
multiple times, such as `git ls-files --cached --deleted --modified`
when there is a file with an unstaged deletion).
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-01-13 04:41:52 +00:00
|
|
|
Show files with an unstaged deletion
|
2005-05-10 21:32:30 +00:00
|
|
|
|
2008-06-08 01:36:09 +00:00
|
|
|
-m::
|
|
|
|
--modified::
|
ls-files: clarify descriptions of file selection options
The previous descriptions of the file selection options were very easy
to misunderstand. For example:
* "Show cached files in the output"
This could be interpreted as meaning "show files which have been
modified and git-add'ed, i.e. files which have cached changes
relative to HEAD".
* "Show deleted files"
This could be interpreted as meaning "for each `git rm $FILE` we
ran, show me $FILE"
* "Show modified files"
This could be interpreted as meaning "show files which have been
modified and git-add'ed" or as "show me files that differ from HEAD"
or as "show me undeleted files different from HEAD" (given that
--deleted is a separate option), none of which are correct.
Further, it's not very clear when some options only modify and/or
override other options, as was the case with --ignored, --directory, and
--unmerged (I've seen folks confused by each of them on the mailing
list, sometimes even fellow git developers.)
Tweak these definitions, and the one for --killed, to try to make them
all a bit more clear. Finally, also clarify early on that duplicate
reports for paths are often expected (both when (a) there are multiple
entries for the file in the index -- i.e. when there are conflicts, and
also (b) when the user specifies options that might pick the same file
multiple times, such as `git ls-files --cached --deleted --modified`
when there is a file with an unstaged deletion).
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-01-13 04:41:52 +00:00
|
|
|
Show files with an unstaged modification (note that an unstaged
|
|
|
|
deletion also counts as an unstaged modification)
|
2005-09-19 22:11:15 +00:00
|
|
|
|
2008-06-08 01:36:09 +00:00
|
|
|
-o::
|
|
|
|
--others::
|
2009-08-06 15:11:48 +00:00
|
|
|
Show other (i.e. untracked) files in the output
|
2005-05-10 21:32:30 +00:00
|
|
|
|
2008-06-08 01:36:09 +00:00
|
|
|
-i::
|
|
|
|
--ignored::
|
ls-files: clarify descriptions of file selection options
The previous descriptions of the file selection options were very easy
to misunderstand. For example:
* "Show cached files in the output"
This could be interpreted as meaning "show files which have been
modified and git-add'ed, i.e. files which have cached changes
relative to HEAD".
* "Show deleted files"
This could be interpreted as meaning "for each `git rm $FILE` we
ran, show me $FILE"
* "Show modified files"
This could be interpreted as meaning "show files which have been
modified and git-add'ed" or as "show me files that differ from HEAD"
or as "show me undeleted files different from HEAD" (given that
--deleted is a separate option), none of which are correct.
Further, it's not very clear when some options only modify and/or
override other options, as was the case with --ignored, --directory, and
--unmerged (I've seen folks confused by each of them on the mailing
list, sometimes even fellow git developers.)
Tweak these definitions, and the one for --killed, to try to make them
all a bit more clear. Finally, also clarify early on that duplicate
reports for paths are often expected (both when (a) there are multiple
entries for the file in the index -- i.e. when there are conflicts, and
also (b) when the user specifies options that might pick the same file
multiple times, such as `git ls-files --cached --deleted --modified`
when there is a file with an unstaged deletion).
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-01-13 04:41:52 +00:00
|
|
|
Show only ignored files in the output. Must be used with
|
|
|
|
either an explicit '-c' or '-o'. When showing files in the
|
|
|
|
index (i.e. when used with '-c'), print only those files
|
|
|
|
matching an exclude pattern. When showing "other" files
|
|
|
|
(i.e. when used with '-o'), show only those matched by an
|
|
|
|
exclude pattern. Standard ignore rules are not automatically
|
2023-10-08 06:45:21 +00:00
|
|
|
activated; therefore, at least one of the `--exclude*` options
|
ls-files: clarify descriptions of file selection options
The previous descriptions of the file selection options were very easy
to misunderstand. For example:
* "Show cached files in the output"
This could be interpreted as meaning "show files which have been
modified and git-add'ed, i.e. files which have cached changes
relative to HEAD".
* "Show deleted files"
This could be interpreted as meaning "for each `git rm $FILE` we
ran, show me $FILE"
* "Show modified files"
This could be interpreted as meaning "show files which have been
modified and git-add'ed" or as "show me files that differ from HEAD"
or as "show me undeleted files different from HEAD" (given that
--deleted is a separate option), none of which are correct.
Further, it's not very clear when some options only modify and/or
override other options, as was the case with --ignored, --directory, and
--unmerged (I've seen folks confused by each of them on the mailing
list, sometimes even fellow git developers.)
Tweak these definitions, and the one for --killed, to try to make them
all a bit more clear. Finally, also clarify early on that duplicate
reports for paths are often expected (both when (a) there are multiple
entries for the file in the index -- i.e. when there are conflicts, and
also (b) when the user specifies options that might pick the same file
multiple times, such as `git ls-files --cached --deleted --modified`
when there is a file with an unstaged deletion).
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-01-13 04:41:52 +00:00
|
|
|
is required.
|
2005-05-10 21:32:30 +00:00
|
|
|
|
2008-06-08 01:36:09 +00:00
|
|
|
-s::
|
|
|
|
--stage::
|
2017-04-01 07:08:25 +00:00
|
|
|
Show staged contents' mode bits, object name and stage number in the output.
|
2005-05-10 21:32:30 +00:00
|
|
|
|
2006-01-22 00:22:30 +00:00
|
|
|
--directory::
|
|
|
|
If a whole directory is classified as "other", show just its
|
|
|
|
name (with a trailing slash) and not its whole contents.
|
ls-files: clarify descriptions of file selection options
The previous descriptions of the file selection options were very easy
to misunderstand. For example:
* "Show cached files in the output"
This could be interpreted as meaning "show files which have been
modified and git-add'ed, i.e. files which have cached changes
relative to HEAD".
* "Show deleted files"
This could be interpreted as meaning "for each `git rm $FILE` we
ran, show me $FILE"
* "Show modified files"
This could be interpreted as meaning "show files which have been
modified and git-add'ed" or as "show me files that differ from HEAD"
or as "show me undeleted files different from HEAD" (given that
--deleted is a separate option), none of which are correct.
Further, it's not very clear when some options only modify and/or
override other options, as was the case with --ignored, --directory, and
--unmerged (I've seen folks confused by each of them on the mailing
list, sometimes even fellow git developers.)
Tweak these definitions, and the one for --killed, to try to make them
all a bit more clear. Finally, also clarify early on that duplicate
reports for paths are often expected (both when (a) there are multiple
entries for the file in the index -- i.e. when there are conflicts, and
also (b) when the user specifies options that might pick the same file
multiple times, such as `git ls-files --cached --deleted --modified`
when there is a file with an unstaged deletion).
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-01-13 04:41:52 +00:00
|
|
|
Has no effect without -o/--others.
|
2006-01-22 00:22:30 +00:00
|
|
|
|
2006-03-26 14:59:52 +00:00
|
|
|
--no-empty-directory::
|
|
|
|
Do not list empty directories. Has no effect without --directory.
|
|
|
|
|
2008-06-08 01:36:09 +00:00
|
|
|
-u::
|
|
|
|
--unmerged::
|
ls-files: clarify descriptions of file selection options
The previous descriptions of the file selection options were very easy
to misunderstand. For example:
* "Show cached files in the output"
This could be interpreted as meaning "show files which have been
modified and git-add'ed, i.e. files which have cached changes
relative to HEAD".
* "Show deleted files"
This could be interpreted as meaning "for each `git rm $FILE` we
ran, show me $FILE"
* "Show modified files"
This could be interpreted as meaning "show files which have been
modified and git-add'ed" or as "show me files that differ from HEAD"
or as "show me undeleted files different from HEAD" (given that
--deleted is a separate option), none of which are correct.
Further, it's not very clear when some options only modify and/or
override other options, as was the case with --ignored, --directory, and
--unmerged (I've seen folks confused by each of them on the mailing
list, sometimes even fellow git developers.)
Tweak these definitions, and the one for --killed, to try to make them
all a bit more clear. Finally, also clarify early on that duplicate
reports for paths are often expected (both when (a) there are multiple
entries for the file in the index -- i.e. when there are conflicts, and
also (b) when the user specifies options that might pick the same file
multiple times, such as `git ls-files --cached --deleted --modified`
when there is a file with an unstaged deletion).
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-01-13 04:41:52 +00:00
|
|
|
Show information about unmerged files in the output, but do
|
|
|
|
not show any other tracked files (forces --stage, overrides
|
|
|
|
--cached).
|
2005-05-10 21:32:30 +00:00
|
|
|
|
2008-06-08 01:36:09 +00:00
|
|
|
-k::
|
|
|
|
--killed::
|
ls-files: clarify descriptions of file selection options
The previous descriptions of the file selection options were very easy
to misunderstand. For example:
* "Show cached files in the output"
This could be interpreted as meaning "show files which have been
modified and git-add'ed, i.e. files which have cached changes
relative to HEAD".
* "Show deleted files"
This could be interpreted as meaning "for each `git rm $FILE` we
ran, show me $FILE"
* "Show modified files"
This could be interpreted as meaning "show files which have been
modified and git-add'ed" or as "show me files that differ from HEAD"
or as "show me undeleted files different from HEAD" (given that
--deleted is a separate option), none of which are correct.
Further, it's not very clear when some options only modify and/or
override other options, as was the case with --ignored, --directory, and
--unmerged (I've seen folks confused by each of them on the mailing
list, sometimes even fellow git developers.)
Tweak these definitions, and the one for --killed, to try to make them
all a bit more clear. Finally, also clarify early on that duplicate
reports for paths are often expected (both when (a) there are multiple
entries for the file in the index -- i.e. when there are conflicts, and
also (b) when the user specifies options that might pick the same file
multiple times, such as `git ls-files --cached --deleted --modified`
when there is a file with an unstaged deletion).
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-01-13 04:41:52 +00:00
|
|
|
Show untracked files on the filesystem that need to be removed
|
|
|
|
due to file/directory conflicts for tracked files to be able to
|
|
|
|
be written to the filesystem.
|
2005-05-13 00:17:54 +00:00
|
|
|
|
2023-01-13 04:41:51 +00:00
|
|
|
--resolve-undo::
|
|
|
|
Show files having resolve-undo information in the index
|
|
|
|
together with their resolve-undo information. (resolve-undo
|
|
|
|
information is what is used to implement "git checkout -m
|
|
|
|
$PATH", i.e. to recreate merge conflicts that were
|
|
|
|
accidentally resolved)
|
|
|
|
|
2005-05-10 21:32:30 +00:00
|
|
|
-z::
|
2017-03-02 19:03:52 +00:00
|
|
|
\0 line termination on output and do not quote filenames.
|
|
|
|
See OUTPUT below for more information.
|
2005-05-10 21:32:30 +00:00
|
|
|
|
2021-01-23 10:20:10 +00:00
|
|
|
--deduplicate::
|
|
|
|
When only filenames are shown, suppress duplicates that may
|
|
|
|
come from having multiple stages during a merge, or giving
|
|
|
|
`--deleted` and `--modified` option at the same time.
|
|
|
|
When any of the `-t`, `--unmerged`, or `--stage` option is
|
|
|
|
in use, this option has no effect.
|
|
|
|
|
2008-06-08 01:36:09 +00:00
|
|
|
-x <pattern>::
|
|
|
|
--exclude=<pattern>::
|
2010-09-16 00:34:20 +00:00
|
|
|
Skip untracked files matching pattern.
|
2010-09-15 23:56:48 +00:00
|
|
|
Note that pattern is a shell wildcard pattern. See EXCLUDE PATTERNS
|
|
|
|
below for more information.
|
2005-05-10 21:32:30 +00:00
|
|
|
|
2008-06-08 01:36:09 +00:00
|
|
|
-X <file>::
|
|
|
|
--exclude-from=<file>::
|
2010-09-16 00:34:20 +00:00
|
|
|
Read exclude patterns from <file>; 1 per line.
|
2005-07-24 22:47:26 +00:00
|
|
|
|
|
|
|
--exclude-per-directory=<file>::
|
2010-09-16 00:34:20 +00:00
|
|
|
Read additional exclude patterns that apply only to the
|
ls-files: avoid the verb "deprecate" for individual options
When e750951e (ls-files: guide folks to --exclude-standard over
other --exclude* options, 2023-01-13) updated the documentation to
give greater visibility to the `--exclude-standard` option, it marked
the `--exclude-per-directory` option as "deprecated".
While it is technically correct that being deprecated does not
necessarily mean it is planned to be removed later, it seems to
cause confusion to readers, especially when we merely mean
The option Y can be used to achieve the same thing as the option
X much simpler. To those of you who aren't familiar with either
X or Y, we would recommend to use Y when appropriate.
This is especially true for `--exclude-standard` vs the combination
of more granular `--exclude-from` and `--exclude-per-directory`
options. It is true that one common combination of the granular
options can be obtained by just giving the former, but that does not
necessarily mean a more granular control is not necessary.
State the reason why we recommend readers `--exclude-standard` in
the description of `--exclude-per-directory`, instead of saying that
the option is deprecated. Also, spell out the recipe to emulate
what `--exclude-standard` does, so that the users can give it minute
tweaks (like "do the same as Git Porcelain, except I do not want to
read the global exclusion file from core.excludes").
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-01-24 21:10:31 +00:00
|
|
|
directory and its subdirectories in <file>. If you are
|
|
|
|
trying to emulate the way Porcelain commands work, using
|
|
|
|
the `--exclude-standard` option instead is easier and more
|
|
|
|
thorough.
|
2005-05-10 21:32:30 +00:00
|
|
|
|
2007-11-15 07:04:30 +00:00
|
|
|
--exclude-standard::
|
2013-01-21 19:17:53 +00:00
|
|
|
Add the standard Git exclusions: .git/info/exclude, .gitignore
|
2007-11-15 07:04:30 +00:00
|
|
|
in each directory, and the user's global exclusion file.
|
|
|
|
|
2006-02-21 20:48:30 +00:00
|
|
|
--error-unmatch::
|
|
|
|
If any <file> does not appear in the index, treat this as an
|
|
|
|
error (return 1).
|
|
|
|
|
2007-09-14 23:59:04 +00:00
|
|
|
--with-tree=<tree-ish>::
|
|
|
|
When using --error-unmatch to expand the user supplied
|
|
|
|
<file> (i.e. path pattern) arguments to paths, pretend
|
|
|
|
that paths which were removed in the index since the
|
|
|
|
named <tree-ish> are still present. Using this option
|
|
|
|
with `-s` or `-u` options does not make any sense.
|
|
|
|
|
2005-05-10 21:32:30 +00:00
|
|
|
-t::
|
ls-files: clarify descriptions of status tags for -t
Much like the file selection options we tweaked in the last commit, the
status tags printed with -t had descriptions that were easy to
misunderstand, and for many of the same reasons. Clarify them.
Also, while at it, remove the "semi-deprecated" comment for "git
ls-files -t". The -t option was marked as semi-deprecated in 5bc0e247c4
("Document ls-files -t as semi-obsolete.", 2010-07-28) because:
"git ls-files -t" is [...] badly documented, hence we point the
users to superior alternatives.
The feature is marked as "semi-obsolete" but not "scheduled for removal"
since it's a plumbing command, scripts might use it, and Git testsuite
already uses it to test the state of the index.
Marking it as obsolete because it was easily misunderstood, which I
think was primarily due to documentation problems, is one strategy, but
I think fixing the documentation is a better option. Especially since
in the intervening time, "git ls-files -t" has become heavily used by
sparse-checkout users where the same confusion just doesn't apply.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-01-13 04:41:53 +00:00
|
|
|
Show status tags together with filenames. Note that for
|
|
|
|
scripting purposes, linkgit:git-status[1] `--porcelain` and
|
2010-07-28 07:24:27 +00:00
|
|
|
linkgit:git-diff-files[1] `--name-status` are almost always
|
2023-10-08 06:45:21 +00:00
|
|
|
superior alternatives; users should look at
|
2010-07-28 07:24:27 +00:00
|
|
|
linkgit:git-status[1] `--short` or linkgit:git-diff[1]
|
|
|
|
`--name-status` for more user-friendly alternatives.
|
|
|
|
+
|
2019-04-22 15:15:41 +00:00
|
|
|
--
|
ls-files: clarify descriptions of status tags for -t
Much like the file selection options we tweaked in the last commit, the
status tags printed with -t had descriptions that were easy to
misunderstand, and for many of the same reasons. Clarify them.
Also, while at it, remove the "semi-deprecated" comment for "git
ls-files -t". The -t option was marked as semi-deprecated in 5bc0e247c4
("Document ls-files -t as semi-obsolete.", 2010-07-28) because:
"git ls-files -t" is [...] badly documented, hence we point the
users to superior alternatives.
The feature is marked as "semi-obsolete" but not "scheduled for removal"
since it's a plumbing command, scripts might use it, and Git testsuite
already uses it to test the state of the index.
Marking it as obsolete because it was easily misunderstood, which I
think was primarily due to documentation problems, is one strategy, but
I think fixing the documentation is a better option. Especially since
in the intervening time, "git ls-files -t" has become heavily used by
sparse-checkout users where the same confusion just doesn't apply.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-01-13 04:41:53 +00:00
|
|
|
This option provides a reason for showing each filename, in the form
|
|
|
|
of a status tag (which is followed by a space and then the filename).
|
|
|
|
The status tags are all single characters from the following list:
|
|
|
|
|
|
|
|
H:: tracked file that is not either unmerged or skip-worktree
|
|
|
|
S:: tracked file that is skip-worktree
|
|
|
|
M:: tracked file that is unmerged
|
|
|
|
R:: tracked file with unstaged removal/deletion
|
|
|
|
C:: tracked file with unstaged modification/change
|
|
|
|
K:: untracked paths which are part of file/directory conflicts
|
|
|
|
which prevent checking out tracked files
|
|
|
|
?:: untracked file
|
|
|
|
U:: file with resolve-undo information
|
2019-04-22 15:15:41 +00:00
|
|
|
--
|
2005-05-10 21:32:30 +00:00
|
|
|
|
2006-02-12 09:48:47 +00:00
|
|
|
-v::
|
|
|
|
Similar to `-t`, but use lowercase letters for files
|
2007-12-21 21:50:58 +00:00
|
|
|
that are marked as 'assume unchanged' (see
|
2007-12-29 06:20:38 +00:00
|
|
|
linkgit:git-update-index[1]).
|
2006-02-12 09:48:47 +00:00
|
|
|
|
2017-09-22 16:35:41 +00:00
|
|
|
-f::
|
|
|
|
Similar to `-t`, but use lowercase letters for files
|
|
|
|
that are marked as 'fsmonitor valid' (see
|
|
|
|
linkgit:git-update-index[1]).
|
|
|
|
|
2005-12-23 23:51:33 +00:00
|
|
|
--full-name::
|
|
|
|
When run from a subdirectory, the command usually
|
|
|
|
outputs paths relative to the current directory. This
|
|
|
|
option forces paths to be output relative to the project
|
|
|
|
top directory.
|
|
|
|
|
2016-10-07 18:18:49 +00:00
|
|
|
--recurse-submodules::
|
doc: --recurse-submodules mostly applies to active submodules
The documentation refers to "initialized" or "populated" submodules,
to explain which submodules are affected by '--recurse-submodules', but
the real terminology here is 'active' submodules. Update the
documentation accordingly.
Some terminology:
- Active is defined in gitsubmodules(7), it only involves the
configuration variables 'submodule.active', 'submodule.<name>.active'
and 'submodule.<name>.url'. The function
submodule.c::is_submodule_active checks that a submodule is active.
- Populated means that the submodule's working tree is present (and the
gitfile correctly points to the submodule repository), i.e. either the
superproject was cloned with ` --recurse-submodules`, or the user ran
`git submodule update --init`, or `git submodule init [<path>]` and
`git submodule update [<path>]` separately which populated the
submodule working tree. This does not involve the 3 configuration
variables above.
- Initialized (at least in the context of the man pages involved in this
patch) means both "populated" and "active" as defined above, i.e. what
`git submodule update --init` does.
The --recurse-submodules option mostly affects active submodules. An
exception is `git fetch` where the option affects populated submodules.
As a consequence, in `git pull --recurse-submodules` the fetch affects
populated submodules, but the resulting working tree update only affects
active submodules.
In the documentation of `git-pull`, let's distinguish between the
fetching part which affects populated submodules, and the updating of
worktrees, which only affects active submodules.
Signed-off-by: Damien Robert <damien.olivier.robert+git@gmail.com>
Helped-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-04-06 13:57:09 +00:00
|
|
|
Recursively calls ls-files on each active submodule in the repository.
|
2022-02-24 00:23:03 +00:00
|
|
|
Currently there is only support for the --cached and --stage modes.
|
2016-10-07 18:18:49 +00:00
|
|
|
|
2006-03-07 19:59:17 +00:00
|
|
|
--abbrev[=<n>]::
|
|
|
|
Instead of showing the full 40-byte hexadecimal object
|
2020-11-04 22:01:37 +00:00
|
|
|
lines, show the shortest prefix that is at least '<n>'
|
|
|
|
hexdigits long that uniquely refers the object.
|
2006-03-07 19:59:17 +00:00
|
|
|
Non default number of digits can be specified with --abbrev=<n>.
|
|
|
|
|
2010-07-30 22:35:59 +00:00
|
|
|
--debug::
|
|
|
|
After each line that describes a file, add more data about its
|
|
|
|
cache entry. This is intended to show as much information as
|
|
|
|
possible for manual inspection; the exact format may change at
|
|
|
|
any time.
|
|
|
|
|
2016-01-16 06:50:02 +00:00
|
|
|
--eol::
|
|
|
|
Show <eolinfo> and <eolattr> of files.
|
|
|
|
<eolinfo> is the file content identification used by Git when
|
|
|
|
the "text" attribute is "auto" (or not set and core.autocrlf is not false).
|
|
|
|
<eolinfo> is either "-text", "none", "lf", "crlf", "mixed" or "".
|
|
|
|
+
|
|
|
|
"" means the file is not a regular file, it is not in the index or
|
2016-03-03 18:43:51 +00:00
|
|
|
not accessible in the working tree.
|
2016-01-16 06:50:02 +00:00
|
|
|
+
|
|
|
|
<eolattr> is the attribute that is used when checking out or committing,
|
|
|
|
it is either "", "-text", "text", "text=auto", "text eol=lf", "text eol=crlf".
|
2016-08-25 15:52:57 +00:00
|
|
|
Since Git 2.10 "text=auto eol=lf" and "text=auto eol=crlf" are supported.
|
2016-01-16 06:50:02 +00:00
|
|
|
+
|
|
|
|
Both the <eolinfo> in the index ("i/<eolinfo>")
|
|
|
|
and in the working tree ("w/<eolinfo>") are shown for regular files,
|
|
|
|
followed by the ("attr/<eolattr>").
|
|
|
|
|
2021-12-22 14:20:53 +00:00
|
|
|
--sparse::
|
|
|
|
If the index is sparse, show the sparse directories without expanding
|
|
|
|
to the contained files. Sparse directories will be shown with a
|
|
|
|
trailing slash, such as "x/" for a sparse directory "x".
|
|
|
|
|
2022-07-23 06:44:45 +00:00
|
|
|
--format=<format>::
|
|
|
|
A string that interpolates `%(fieldname)` from the result being shown.
|
|
|
|
It also interpolates `%%` to `%`, and `%xx` where `xx` are hex digits
|
|
|
|
interpolates to character with hex code `xx`; for example `%00`
|
|
|
|
interpolates to `\0` (NUL), `%09` to `\t` (TAB) and %0a to `\n` (LF).
|
|
|
|
--format cannot be combined with `-s`, `-o`, `-k`, `-t`, `--resolve-undo`
|
|
|
|
and `--eol`.
|
2006-05-05 19:05:24 +00:00
|
|
|
\--::
|
2005-10-02 15:33:38 +00:00
|
|
|
Do not interpret any more arguments as options.
|
|
|
|
|
|
|
|
<file>::
|
|
|
|
Files to show. If no files are given all files which match the other
|
|
|
|
specified criteria are shown.
|
|
|
|
|
2018-04-30 15:35:33 +00:00
|
|
|
OUTPUT
|
2005-05-10 21:32:30 +00:00
|
|
|
------
|
2016-06-28 11:40:11 +00:00
|
|
|
'git ls-files' just outputs the filenames unless `--stage` is specified in
|
2005-05-10 21:32:30 +00:00
|
|
|
which case it outputs:
|
|
|
|
|
|
|
|
[<tag> ]<mode> <object> <stage> <file>
|
|
|
|
|
2016-01-16 06:50:02 +00:00
|
|
|
'git ls-files --eol' will show
|
|
|
|
i/<eolinfo><SPACES>w/<eolinfo><SPACES>attr/<eolattr><SPACE*><TAB><file>
|
|
|
|
|
2010-01-09 23:33:00 +00:00
|
|
|
'git ls-files --unmerged' and 'git ls-files --stage' can be used to examine
|
2005-05-10 21:32:30 +00:00
|
|
|
detailed information on unmerged paths.
|
|
|
|
|
2013-04-15 17:49:04 +00:00
|
|
|
For an unmerged path, instead of recording a single mode/SHA-1 pair,
|
2007-05-25 22:37:40 +00:00
|
|
|
the index records up to three such pairs; one from tree O in stage
|
2005-05-10 21:32:30 +00:00
|
|
|
1, A in stage 2, and B in stage 3. This information can be used by
|
2005-08-05 15:05:02 +00:00
|
|
|
the user (or the porcelain) to see what should eventually be recorded at the
|
2008-06-30 18:56:34 +00:00
|
|
|
path. (see linkgit:git-read-tree[1] for more information on state)
|
2005-05-10 21:32:30 +00:00
|
|
|
|
2017-03-02 19:03:52 +00:00
|
|
|
Without the `-z` option, pathnames with "unusual" characters are
|
|
|
|
quoted as explained for the configuration variable `core.quotePath`
|
|
|
|
(see linkgit:git-config[1]). Using `-z` the filename is output
|
|
|
|
verbatim and the line is terminated by a NUL byte.
|
2005-10-15 04:56:46 +00:00
|
|
|
|
2022-07-23 06:44:45 +00:00
|
|
|
It is possible to print in a custom format by using the `--format`
|
|
|
|
option, which is able to interpolate different fields using
|
|
|
|
a `%(fieldname)` notation. For example, if you only care about the
|
|
|
|
"objectname" and "path" fields, you can execute with a specific
|
|
|
|
"--format" like
|
|
|
|
|
|
|
|
git ls-files --format='%(objectname) %(path)'
|
|
|
|
|
|
|
|
FIELD NAMES
|
|
|
|
-----------
|
|
|
|
The way each path is shown can be customized by using the
|
|
|
|
`--format=<format>` option, where the %(fieldname) in the
|
|
|
|
<format> string for various aspects of the index entry are
|
|
|
|
interpolated. The following "fieldname" are understood:
|
|
|
|
|
|
|
|
objectmode::
|
|
|
|
The mode of the file which is recorded in the index.
|
2023-05-23 09:00:18 +00:00
|
|
|
objecttype::
|
|
|
|
The object type of the file which is recorded in the index.
|
2022-07-23 06:44:45 +00:00
|
|
|
objectname::
|
|
|
|
The name of the file which is recorded in the index.
|
2023-05-23 09:00:18 +00:00
|
|
|
objectsize[:padded]::
|
|
|
|
The object size of the file which is recorded in the index
|
|
|
|
("-" if the object is a `commit` or `tree`).
|
|
|
|
It also supports a padded format of size with "%(objectsize:padded)".
|
2022-07-23 06:44:45 +00:00
|
|
|
stage::
|
|
|
|
The stage of the file which is recorded in the index.
|
|
|
|
eolinfo:index::
|
|
|
|
eolinfo:worktree::
|
|
|
|
The <eolinfo> (see the description of the `--eol` option) of
|
|
|
|
the contents in the index or in the worktree for the path.
|
|
|
|
eolattr::
|
|
|
|
The <eolattr> (see the description of the `--eol` option)
|
|
|
|
that applies to the path.
|
|
|
|
path::
|
|
|
|
The pathname of the file which is recorded in the index.
|
2005-07-24 22:47:26 +00:00
|
|
|
|
2018-04-30 15:35:33 +00:00
|
|
|
EXCLUDE PATTERNS
|
2005-07-24 22:47:26 +00:00
|
|
|
----------------
|
|
|
|
|
2010-01-09 23:33:00 +00:00
|
|
|
'git ls-files' can use a list of "exclude patterns" when
|
2005-07-24 22:47:26 +00:00
|
|
|
traversing the directory tree and finding files to show when the
|
2007-12-29 06:20:38 +00:00
|
|
|
flags --others or --ignored are specified. linkgit:gitignore[5]
|
2007-06-02 17:08:54 +00:00
|
|
|
specifies the format of exclude patterns.
|
2005-07-24 22:47:26 +00:00
|
|
|
|
ls-files: avoid the verb "deprecate" for individual options
When e750951e (ls-files: guide folks to --exclude-standard over
other --exclude* options, 2023-01-13) updated the documentation to
give greater visibility to the `--exclude-standard` option, it marked
the `--exclude-per-directory` option as "deprecated".
While it is technically correct that being deprecated does not
necessarily mean it is planned to be removed later, it seems to
cause confusion to readers, especially when we merely mean
The option Y can be used to achieve the same thing as the option
X much simpler. To those of you who aren't familiar with either
X or Y, we would recommend to use Y when appropriate.
This is especially true for `--exclude-standard` vs the combination
of more granular `--exclude-from` and `--exclude-per-directory`
options. It is true that one common combination of the granular
options can be obtained by just giving the former, but that does not
necessarily mean a more granular control is not necessary.
State the reason why we recommend readers `--exclude-standard` in
the description of `--exclude-per-directory`, instead of saying that
the option is deprecated. Also, spell out the recipe to emulate
what `--exclude-standard` does, so that the users can give it minute
tweaks (like "do the same as Git Porcelain, except I do not want to
read the global exclusion file from core.excludes").
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-01-24 21:10:31 +00:00
|
|
|
These exclude patterns can be specified from the following places,
|
|
|
|
in order:
|
2005-07-24 22:47:26 +00:00
|
|
|
|
2014-05-21 18:52:26 +00:00
|
|
|
1. The command-line flag --exclude=<pattern> specifies a
|
2007-06-02 17:08:54 +00:00
|
|
|
single pattern. Patterns are ordered in the same order
|
|
|
|
they appear in the command line.
|
2005-07-24 22:47:26 +00:00
|
|
|
|
2014-05-21 18:52:26 +00:00
|
|
|
2. The command-line flag --exclude-from=<file> specifies a
|
2007-06-02 17:08:54 +00:00
|
|
|
file containing a list of patterns. Patterns are ordered
|
|
|
|
in the same order they appear in the file.
|
2005-07-24 22:47:26 +00:00
|
|
|
|
2014-05-21 18:52:26 +00:00
|
|
|
3. The command-line flag --exclude-per-directory=<name> specifies
|
2010-01-09 23:33:00 +00:00
|
|
|
a name of the file in each directory 'git ls-files'
|
2007-06-02 17:08:54 +00:00
|
|
|
examines, normally `.gitignore`. Files in deeper
|
|
|
|
directories take precedence. Patterns are ordered in the
|
|
|
|
same order they appear in the files.
|
2005-07-24 22:47:26 +00:00
|
|
|
|
|
|
|
A pattern specified on the command line with --exclude or read
|
|
|
|
from the file specified with --exclude-from is relative to the
|
|
|
|
top of the directory tree. A pattern read from a file specified
|
|
|
|
by --exclude-per-directory is relative to the directory that the
|
|
|
|
pattern file appears in.
|
|
|
|
|
ls-files: avoid the verb "deprecate" for individual options
When e750951e (ls-files: guide folks to --exclude-standard over
other --exclude* options, 2023-01-13) updated the documentation to
give greater visibility to the `--exclude-standard` option, it marked
the `--exclude-per-directory` option as "deprecated".
While it is technically correct that being deprecated does not
necessarily mean it is planned to be removed later, it seems to
cause confusion to readers, especially when we merely mean
The option Y can be used to achieve the same thing as the option
X much simpler. To those of you who aren't familiar with either
X or Y, we would recommend to use Y when appropriate.
This is especially true for `--exclude-standard` vs the combination
of more granular `--exclude-from` and `--exclude-per-directory`
options. It is true that one common combination of the granular
options can be obtained by just giving the former, but that does not
necessarily mean a more granular control is not necessary.
State the reason why we recommend readers `--exclude-standard` in
the description of `--exclude-per-directory`, instead of saying that
the option is deprecated. Also, spell out the recipe to emulate
what `--exclude-standard` does, so that the users can give it minute
tweaks (like "do the same as Git Porcelain, except I do not want to
read the global exclusion file from core.excludes").
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-01-24 21:10:31 +00:00
|
|
|
Generally, you should be able to use `--exclude-standard` when you
|
|
|
|
want the exclude rules applied the same way as what Porcelain
|
|
|
|
commands do. To emulate what `--exclude-standard` specifies, you
|
|
|
|
can give `--exclude-per-directory=.gitignore`, and then specify:
|
|
|
|
|
|
|
|
1. The file specified by the `core.excludesfile` configuration
|
|
|
|
variable, if exists, or the `$XDG_CONFIG_HOME/git/ignore` file.
|
|
|
|
|
|
|
|
2. The `$GIT_DIR/info/exclude` file.
|
|
|
|
|
|
|
|
via the `--exclude-from=` option.
|
|
|
|
|
2008-05-28 23:55:27 +00:00
|
|
|
SEE ALSO
|
2005-05-10 21:32:38 +00:00
|
|
|
--------
|
2007-12-29 06:20:38 +00:00
|
|
|
linkgit:git-read-tree[1], linkgit:gitignore[5]
|
2005-05-10 21:32:30 +00:00
|
|
|
|
|
|
|
GIT
|
|
|
|
---
|
2008-06-06 07:07:32 +00:00
|
|
|
Part of the linkgit:git[1] suite
|