diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-21 10:44:52 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-21 10:44:52 +0300 |
| commit | 750054cd3f1298bc9e113a47eaa6346923e08c19 (patch) | |
| tree | 2a1f04ed14b6a705723c2832939d50b302252625 /Documentation | |
| parent | 1b8dbdb41e503f6829be4e1d8ada4c8eabbc49bd (diff) | |
| parent | d74bb308fa9e49e0a5b9a0792e6079bbc0c8aea8 (diff) | |
Merge branch 'jn/help-everywhere'
* jn/help-everywhere: (23 commits)
diff --no-index: make the usage string less scary
merge-{recursive,subtree}: use usagef() to print usage
Introduce usagef() that takes a printf-style format
Let 'git <command> -h' show usage without a git dir
Show usage string for 'git http-push -h'
Let 'git http-fetch -h' show usage outside any git repository
Show usage string for 'git stripspace -h'
Show usage string for 'git unpack-file -h'
Show usage string for 'git show-index -h'
Show usage string for 'git rev-parse -h'
Show usage string for 'git merge-one-file -h'
Show usage string for 'git mailsplit -h'
Show usage string for 'git imap-send -h'
Show usage string for 'git get-tar-commit-id -h'
Show usage string for 'git fast-import -h'
Show usage string for 'git check-ref-format -h'
http-fetch: add missing initialization of argv0_path
Show usage string for 'git show-ref -h'
Show usage string for 'git merge-ours -h'
Show usage string for 'git commit-tree -h'
...
Conflicts:
imap-send.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-show-ref.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-show-ref.txt b/Documentation/git-show-ref.txt index f4429bdc68..70f400b266 100644 --- a/Documentation/git-show-ref.txt +++ b/Documentation/git-show-ref.txt @@ -8,7 +8,7 @@ git-show-ref - List references in a local repository SYNOPSIS -------- [verse] -'git show-ref' [-q|--quiet] [--verify] [-h|--head] [-d|--dereference] +'git show-ref' [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] <pattern>... 'git show-ref' --exclude-existing[=<pattern>] < ref-list @@ -30,7 +30,6 @@ the `.git` directory. OPTIONS ------- --h:: --head:: Show the HEAD reference. |