aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-23 15:51:33 -0800
committerJunio C Hamano <junkio@cox.net>2005-12-23 15:51:33 -0800
commit9a84074d08e2e816a3310eb34ac69b584faf817b (patch)
tree120926a0de20cfe745dc49c20740ea43c16a9d25
parent695bf722da848e0cd2692bc07c4a2773c52b4216 (diff)
downloadgit-9a84074d08e2e816a3310eb34ac69b584faf817b.tar.gz
git-9a84074d08e2e816a3310eb34ac69b584faf817b.tar.xz
ls-files --full-name: usage string and documentation.
Somehow this option was not mentioned anywhere in the documentation nor the usage string. Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/git-ls-files.txt9
-rw-r--r--ls-files.c2
2 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 2f308ecda..186f3bb57 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -13,7 +13,8 @@ SYNOPSIS
(-[c|d|o|i|s|u|k|m])\*
[-x <pattern>|--exclude=<pattern>]
[-X <file>|--exclude-from=<file>]
- [--exclude-per-directory=<file>] [--] [<file>]\*
+ [--exclude-per-directory=<file>]
+ [--full-name] [--] [<file>]\*
DESCRIPTION
-----------
@@ -77,6 +78,12 @@ OPTIONS
K:: to be killed
? other
+--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.
+
--::
Do not interpret any more arguments as options.
diff --git a/ls-files.c b/ls-files.c
index f3f1a6a66..5e9ac712a 100644
--- a/ls-files.c
+++ b/ls-files.c
@@ -562,7 +562,7 @@ static void verify_pathspec(void)
static const char ls_files_usage[] =
"git-ls-files [-z] [-t] (--[cached|deleted|others|stage|unmerged|killed|modified])* "
"[ --ignored ] [--exclude=<pattern>] [--exclude-from=<file>] "
- "[ --exclude-per-directory=<filename> ] [--] [<file>]*";
+ "[ --exclude-per-directory=<filename> ] [--full-name] [--] [<file>]*";
int main(int argc, const char **argv)
{