summaryrefslogtreecommitdiff
path: root/Documentation/git-checkout-index.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-10-18 00:41:37 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-10-18 00:41:37 (GMT)
commit2b2dabc29f53c5835868029585000ee487cf6cbb (patch)
treeed7fbf118ac006f0668b019ef7a51dd3e9820b35 /Documentation/git-checkout-index.txt
parent622ef9df199cdbc11ff30e1d92324c1abe3f89cb (diff)
parentfd25c82a80533da035d42a5ac229ec5c5b332411 (diff)
downloadgit-2b2dabc29f53c5835868029585000ee487cf6cbb.zip
git-2b2dabc29f53c5835868029585000ee487cf6cbb.tar.gz
git-2b2dabc29f53c5835868029585000ee487cf6cbb.tar.bz2
Merge branch 'fixes'
Diffstat (limited to 'Documentation/git-checkout-index.txt')
-rw-r--r--Documentation/git-checkout-index.txt20
1 files changed, 7 insertions, 13 deletions
diff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt
index 613dfab..589dc9a 100644
--- a/Documentation/git-checkout-index.txt
+++ b/Documentation/git-checkout-index.txt
@@ -29,8 +29,8 @@ OPTIONS
forces overwrite of existing files
-a::
- checks out all files in the cache (will then continue to
- process listed files).
+ checks out all files in the cache. Cannot be used
+ together with explicit filenames.
-n::
Don't checkout new files, only refresh files already checked
@@ -43,15 +43,9 @@ OPTIONS
--::
Do not interpret any more arguments as options.
-Note that the order of the flags matters:
+The order of the flags used to matter, but not anymore.
- git-checkout-index -a -f file.c
-
-will first check out all files listed in the cache (but not overwrite
-any old ones), and then force-checkout `file.c` a second time (ie that
-one *will* overwrite any old contents with the same filename).
-
-Also, just doing "git-checkout-index" does nothing. You probably meant
+Just doing "git-checkout-index" does nothing. You probably meant
"git-checkout-index -a". And if you want to force it, you want
"git-checkout-index -f -a".
@@ -77,12 +71,12 @@ scripting!).
The prefix ability basically makes it trivial to use
git-checkout-index as an "export as tree" function. Just read the
desired tree into the index, and do a
-
+
git-checkout-index --prefix=git-export-dir/ -a
-
+
and git-checkout-index will "export" the cache into the specified
directory.
-
+
NOTE The final "/" is important. The exported name is literally just
prefixed with the specified string, so you can also do something like