summaryrefslogtreecommitdiff
path: root/Documentation/git-ls-files.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-13 00:17:54 (GMT)
committerPetr Baudis <xpasky@machine.sinus.cz>2005-05-13 05:34:59 (GMT)
commit6ca45943121a92cad5c6ebef71764fb441bff356 (patch)
tree2a5e43fa9318a648bfb4dbf64208f4c26905a5f8 /Documentation/git-ls-files.txt
parenta15c1c60db9abb981754b1ba3b899f49949ae8b7 (diff)
downloadgit-6ca45943121a92cad5c6ebef71764fb441bff356.zip
git-6ca45943121a92cad5c6ebef71764fb441bff356.tar.gz
git-6ca45943121a92cad5c6ebef71764fb441bff356.tar.bz2
[PATCH 3/3] Add git-ls-files -k.
When checkout-cache attempts to check out a non-directory where a directory exists on the work tree, or to check out a file under directory D when path D is a non-directory on the work tree, the attempt fails. Before running checkout-cache, the user can run git-ls-files with the -k (killed) option to get a list of such paths. The tagged output format uses "K" to denote them. This is useful for Porcelain layer to be careful when dealing with the recently corrected behaviour of checkout-cache. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Petr Baudis <pasky@ucw.cz>
Diffstat (limited to 'Documentation/git-ls-files.txt')
-rw-r--r--Documentation/git-ls-files.txt10
1 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 14ca695..be83ab1 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -10,8 +10,8 @@ git-ls-files - Information about files in the cache/working directory
SYNOPSIS
--------
'git-ls-files' [-z] [-t]
- (--[cached|deleted|others|ignored|stage|unmerged])\*
- (-[c|d|o|i|s|u])\*
+ (--[cached|deleted|others|ignored|stage|unmerged|killed])\*
+ (-[c|d|o|i|s|u|k])\*
[-x <pattern>|--exclude=<pattern>]
[-X <file>|--exclude-from=<file>]
@@ -45,6 +45,11 @@ OPTIONS
-u|--unmerged::
Show unmerged files in the output (forces --stage)
+-k|--killed::
+ Show files on the filesystem that need to be removed due
+ to file/directory conflicts for checkout-cache to
+ succeed.
+
-z::
\0 line termination on output
@@ -65,6 +70,7 @@ OPTIONS
H cached
M unmerged
R removed/deleted
+ K to be killed
? other
Output