diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-10-22 01:26:42 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-10-22 01:26:42 +0200 |
commit | f7bff60de95951d2c82601350cb3771b347e83ee (patch) | |
tree | 5c0e747a86d4990b4e5b7176cec670de620dabe8 /Documentation/git-update-index.txt | |
parent | Merge branch 'mg/fix-build-remote-helpers' into maint (diff) | |
parent | Fix {update,checkout}-index usage strings (diff) | |
download | git-f7bff60de95951d2c82601350cb3771b347e83ee.tar.xz git-f7bff60de95951d2c82601350cb3771b347e83ee.zip |
Merge branch 'sn/doc-opt-notation' into maint
* sn/doc-opt-notation:
Fix {update,checkout}-index usage strings
Put a space between `<' and argument in pack-objects usage string
Remove stray quotes in --pretty and --format documentation
Use parentheses and `...' where appropriate
Fix odd markup in --diff-filter documentation
Use angles for placeholders consistently
Diffstat (limited to 'Documentation/git-update-index.txt')
-rw-r--r-- | Documentation/git-update-index.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index 26fd8d0df8..1ca56c85aa 100644 --- a/Documentation/git-update-index.txt +++ b/Documentation/git-update-index.txt @@ -12,7 +12,7 @@ SYNOPSIS 'git update-index' [--add] [--remove | --force-remove] [--replace] [--refresh] [-q] [--unmerged] [--ignore-missing] - [--cacheinfo <mode> <object> <file>]* + [(--cacheinfo <mode> <object> <file>)...] [--chmod=(+|-)x] [--assume-unchanged | --no-assume-unchanged] [--skip-worktree | --no-skip-worktree] @@ -21,7 +21,7 @@ SYNOPSIS [--info-only] [--index-info] [-z] [--stdin] [--verbose] - [--] [<file>]* + [--] [<file>...] DESCRIPTION ----------- |