summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-18 00:25:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-18 00:25:37 (GMT)
commitddd89c6f86210f18ce19198d163e05dfd311c5ce (patch)
treea833cad63d0b6c120d8bb686ea2d7f74e1a69889
parent4bfe7cb6668c43c1136304bbb17eea1b3ddf0237 (diff)
parenta47a645e7057f28441f0f4b259db11171158553a (diff)
downloadgit-ddd89c6f86210f18ce19198d163e05dfd311c5ce.zip
git-ddd89c6f86210f18ce19198d163e05dfd311c5ce.tar.gz
git-ddd89c6f86210f18ce19198d163e05dfd311c5ce.tar.bz2
Merge branch 'maint'
* maint: checkout-index: remove obsolete comment
-rw-r--r--builtin/checkout-index.c32
1 files changed, 0 insertions, 32 deletions
diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
index f1fec24..c16d82b 100644
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@ -3,38 +3,6 @@
*
* Copyright (C) 2005 Linus Torvalds
*
- * Careful: order of argument flags does matter. For example,
- *
- * 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 "git checkout-index -a". And if you want to force it, you
- * want "git checkout-index -f -a".
- *
- * Intuitiveness is not the goal here. Repeatability is. The
- * reason for the "no arguments means no work" thing is that
- * from scripts you are supposed to be able to do things like
- *
- * find . -name '*.h' -print0 | xargs -0 git checkout-index -f --
- *
- * or:
- *
- * find . -name '*.h' -print0 | git checkout-index -f -z --stdin
- *
- * which will force all existing *.h files to be replaced with
- * their cached copies. If an empty command line implied "all",
- * then this would force-refresh everything in the cache, which
- * was not the point.
- *
- * Oh, and the "--" is just a good idea when you know the rest
- * will be filenames. Just so that you wouldn't have a filename
- * of "-a" causing problems (not possible in the above example,
- * but get used to it in scripting!).
*/
#include "builtin.h"
#include "cache.h"