summaryrefslogtreecommitdiff
path: root/Documentation/git-show-ref.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-20 23:50:17 -0700
committerJunio C Hamano <gitster@pobox.com>2009-06-20 23:50:17 -0700
commitc5764c095c2a563b657c1bd8f4a3e47bdeee14b0 (patch)
tree2ea2c85a4fc13fbae8e6ad0bd6a8023f13d77f29 /Documentation/git-show-ref.txt
parent2af202be3d2f128c6974290cabe13179c6462196 (diff)
parent3ba4f3a9fc68ba4c5a0064107e8993c5fc5b684f (diff)
downloadgit-c5764c095c2a563b657c1bd8f4a3e47bdeee14b0.tar.gz
Merge branch 'maint'
* maint: git-show-ref.txt: remove word and make consistent git-svn documentation: fix typo in 'rebase vs. pull/merge' section
Diffstat (limited to 'Documentation/git-show-ref.txt')
-rw-r--r--Documentation/git-show-ref.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-show-ref.txt b/Documentation/git-show-ref.txt
index 2f173fff35..98e294aa86 100644
--- a/Documentation/git-show-ref.txt
+++ b/Documentation/git-show-ref.txt
@@ -24,7 +24,7 @@ The --exclude-existing form is a filter that does the inverse, it shows the
refs from stdin that don't exist in the local repository.
Use of this utility is encouraged in favor of directly accessing files under
-in the `.git` directory.
+the `.git` directory.
OPTIONS
-------
@@ -50,7 +50,7 @@ OPTIONS
-s::
--hash::
- Only show the SHA1 hash, not the reference name. When also using
+ Only show the SHA1 hash, not the reference name. When combined with
--dereference the dereferenced tag will still be shown after the SHA1.
--verify::