diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-13 03:46:42 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-13 03:46:42 +0400 |
| commit | 3e52effcf6efa9ef27b3d67d13f535a0381e3bf2 (patch) | |
| tree | 5361ee873615264333932f876287ee66287970e6 /Documentation | |
| parent | c276857ee250ca1c3a36cba8358f50ba01e97917 (diff) | |
| parent | 2d8a7f0b30b4f9ef750ab763aabec117ffe4e749 (diff) | |
Merge branch 'jk/show-upstream'
* jk/show-upstream:
branch: show upstream branch when double verbose
make get_short_ref a public function
for-each-ref: add "upstream" format field
for-each-ref: refactor refname handling
for-each-ref: refactor get_short_ref function
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-branch.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-for-each-ref.txt | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 31ba7f2ade..ba3dea6840 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -100,7 +100,9 @@ OPTIONS -v:: --verbose:: - Show sha1 and commit subject line for each head. + Show sha1 and commit subject line for each head, along with + relationship to upstream branch (if any). If given twice, print + the name of the upstream branch, as well. --abbrev=<length>:: Alter the sha1's minimum display length in the output listing. diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt index 5061d3e4e7..b362e9ed12 100644 --- a/Documentation/git-for-each-ref.txt +++ b/Documentation/git-for-each-ref.txt @@ -85,6 +85,11 @@ objectsize:: objectname:: The object name (aka SHA-1). +upstream:: + The name of a local ref which can be considered ``upstream'' + from the displayed ref. Respects `:short` in the same way as + `refname` above. + In addition to the above, for commit and tag objects, the header field names (`tree`, `parent`, `object`, `type`, and `tag`) can be used to specify the value in the header field. |