diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-13 20:20:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-13 20:20:09 -0700 |
| commit | 38a18873b21f6f2eebedc65aff2249fd6ec2168c (patch) | |
| tree | 5f7d8cce901a2317a8fbdef7bce2fb85742be1fc /Documentation/git-update-index.txt | |
| parent | 2794ad524462c4e2ecd4573d650e7b4f8da89a5d (diff) | |
| parent | 352953a556e7f8d720e26a32d4aabbf823d3c4d4 (diff) | |
| download | git-38a18873b21f6f2eebedc65aff2249fd6ec2168c.tar.gz | |
Merge branch 'maint'
* maint:
Better advice on using topic branches for kernel development
Documentation: update implicit "--no-index" behavior in "git diff"
Documentation: expand 'git diff' SEE ALSO section
Documentation: diff can compare blobs
Documentation: gitrevisions is in section 7
shell portability: no "export VAR=VAL"
CodingGuidelines: reword parameter expansion section
Documentation: update-index: -z applies also to --index-info
Documentation: No argument of ALLOC_GROW should have side-effects
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 74d1d49dbf..26fd8d0df8 100644 --- a/Documentation/git-update-index.txt +++ b/Documentation/git-update-index.txt @@ -144,8 +144,8 @@ you will need to handle the situation manually. Report what is being added and removed from index. -z:: - Only meaningful with `--stdin`; paths are separated with - NUL character instead of LF. + Only meaningful with `--stdin` or `--index-info`; paths are + separated with NUL character instead of LF. \--:: Do not interpret any more arguments as options. |