aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-ls-files.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-26 23:44:14 -0800
committerJunio C Hamano <junkio@cox.net>2006-03-26 23:44:14 -0800
commitd93067d9c7fb210766c7282d662289f54d53f93a (patch)
treea463ad3ce94a987ec3d00e10eaa98ede1fe0495d /Documentation/git-ls-files.txt
parentf4e96f97e85c145616bc2e23e9441bc0daa2906e (diff)
parentb0a3de42316a4e8f1d561cbe12b7bb282631a0d6 (diff)
downloadgit-d93067d9c7fb210766c7282d662289f54d53f93a.tar.gz
git-d93067d9c7fb210766c7282d662289f54d53f93a.tar.xz
Merge branch 'master' into next
* master: Optionally do not list empty directories in git-ls-files --others Document git-rebase behavior on conflicts. Fix error handling for nonexistent names
Diffstat (limited to 'Documentation/git-ls-files.txt')
-rw-r--r--Documentation/git-ls-files.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 59f6adc49..796d049be 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -52,6 +52,9 @@ OPTIONS
If a whole directory is classified as "other", show just its
name (with a trailing slash) and not its whole contents.
+--no-empty-directory::
+ Do not list empty directories. Has no effect without --directory.
+
-u|--unmerged::
Show unmerged files in the output (forces --stage)