summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8278ac2)
raw | patch | inline | side by side (parent: 8278ac2)
author | Petr Baudis <pasky@suse.cz> | |
Sun, 22 Jan 2006 00:22:30 +0000 (01:22 +0100) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sun, 22 Jan 2006 03:12:03 +0000 (19:12 -0800) |
Add the appropriate bit of documentation.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-ls-files.txt | patch | blob | history |
index e42af5ebe2052ad82af362ca7ffd3b6f93af4488..e433407a4e1676c15d0a3c2016b8f4e034d54c32 100644 (file)
-s|--stage::
Show stage files in the output
+--directory::
+ If a whole directory is classified as "other", show just its
+ name (with a trailing slash) and not its whole contents.
+
-u|--unmerged::
Show unmerged files in the output (forces --stage)