diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-04 14:58:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-04 14:58:11 -0800 |
| commit | d10ed827bcf5f07c173313d4575e1d6c720dc25f (patch) | |
| tree | 4d0822b10665035d4675cb5a4058d4306faa3bd9 /Documentation | |
| parent | 2eb063c9331d73548e0fe68802e73ccd68a41046 (diff) | |
| parent | 9debe63d10e476b96ff550d550df344a68b240e8 (diff) | |
| download | git-d10ed827bcf5f07c173313d4575e1d6c720dc25f.tar.gz git-d10ed827bcf5f07c173313d4575e1d6c720dc25f.tar.xz | |
Merge part of 'sp/checkout'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-checkout-index.txt | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt index 2a1e526c6..b0b65889a 100644 --- a/Documentation/git-checkout-index.txt +++ b/Documentation/git-checkout-index.txt @@ -10,7 +10,9 @@ SYNOPSIS -------- [verse] 'git-checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<string>] - [--stage=<number>] [--] <file>... + [--stage=<number>] + [-z] [--stdin] + [--] [<file>]\* DESCRIPTION ----------- @@ -45,6 +47,15 @@ OPTIONS Instead of checking out unmerged entries, copy out the files from named stage. <number> must be between 1 and 3. +--stdin:: + Instead of taking list of paths from the command line, + read list of paths from the standard input. Paths are + separated by LF (i.e. one path per line) by default. + +-z:: + Only meaningful with `--stdin`; paths are separated with + NUL character instead of LF. + --:: Do not interpret any more arguments as options. @@ -64,7 +75,12 @@ $ find . -name '*.h' -print0 | xargs -0 git-checkout-index -f -- 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 index, which was not the point. +force-refresh everything in the index, which was not the point. But +since git-checkout-index accepts --stdin it would be faster to use: + +---------------- +$ find . -name '*.h' -print0 | git-checkout-index -f -z --stdin +---------------- The `--` is just a good idea when you know the rest will be filenames; it will prevent problems with a filename of, for example, `-a`. |