Merge branch 'jc/refs-and-fetch' into next

* jc/refs-and-fetch:
  git-fetch: adjust to packed-refs.
  show-ref --hash=len, --abbrev=len, and --abbrev
This commit is contained in:
Junio C Hamano
2006-10-01 00:44:20 -07:00
3 changed files with 43 additions and 12 deletions

View File

@@ -9,7 +9,7 @@ SYNOPSIS
--------
[verse]
'git-show-ref' [-q|--quiet] [--verify] [-h|--head] [-d|--dereference]
[-s|--hash] [--tags] [--heads] [--] <pattern>...
[-s|--hash] [--abbrev] [--tags] [--heads] [--] <pattern>...
DESCRIPTION
-----------
@@ -37,14 +37,13 @@ OPTIONS
-d, --dereference::
Dereference tags into object IDs. They will be shown with "^{}"
Dereference tags into object IDs as well. They will be shown with "^{}"
appended.
-s, --hash::
Only show the SHA1 hash, not the reference name. When also using
--dereference the dereferenced tag will still be shown after the SHA1,
this maybe a bug.
--dereference the dereferenced tag will still be shown after the SHA1.
--verify::
@@ -52,6 +51,11 @@ OPTIONS
Aside from returning an error code of 1, it will also print an error
message if '--quiet' was not specified.
--abbrev, --abbrev=len::
Abbreviate the object name. When using `--hash`, you do
not have to say `--hash --abbrev`; `--hash=len` would do.
-q, --quiet::
Do not print any results to stdout. When combined with '--verify' this