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-cat-file.txt | |
parent | fast-import: Allow filemodify to set the root (diff) | |
parent | Better advice on using topic branches for kernel development (diff) | |
download | tgif-38a18873b21f6f2eebedc65aff2249fd6ec2168c.tar.xz |
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-cat-file.txt')
-rw-r--r-- | Documentation/git-cat-file.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt index a3f56b07fd..544ba7ba21 100644 --- a/Documentation/git-cat-file.txt +++ b/Documentation/git-cat-file.txt @@ -27,7 +27,7 @@ OPTIONS <object>:: The name of the object to show. For a more complete list of ways to spell object names, see - the "SPECIFYING REVISIONS" section in linkgit:gitrevisions[1]. + the "SPECIFYING REVISIONS" section in linkgit:gitrevisions[7]. -t:: Instead of the content, show the object type identified by |