diff options
| author | Karthik Nayak <karthik.188@gmail.com> | 2017-01-10 14:19:45 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-10 12:44:31 -0800 |
| commit | 3ba308cb4b4ad0d06fa834a42a9380c877b0c16a (patch) | |
| tree | 11338e633c244c5ed7e18ca3737fda115f6a9cd1 /Documentation/git-for-each-ref.txt | |
| parent | a7984101846ccfb8837526a8d79dda5b8c461d84 (diff) | |
| download | git-3ba308cb4b4ad0d06fa834a42a9380c877b0c16a.tar.gz | |
ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
Use the recently introduced refname_atom_parser_internal() within
remote_ref_atom_parser(), this provides a common base for all the ref
printing atoms, allowing %(upstream) and %(push) to also use the
':strip' option.
The atoms '%(push)' and '%(upstream)' will retain the ':track' and
':trackshort' atom modifiers to themselves as they have no meaning in
context to the '%(refname)' and '%(symref)' atoms.
Update the documentation and tests to reflect the same.
Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-for-each-ref.txt')
| -rw-r--r-- | Documentation/git-for-each-ref.txt | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt index 5de22cf649..b18eabd699 100644 --- a/Documentation/git-for-each-ref.txt +++ b/Documentation/git-for-each-ref.txt @@ -116,23 +116,24 @@ objectname:: 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. Additionally respects `:track` to show - "[ahead N, behind M]" and `:trackshort` to show the terse - version: ">" (ahead), "<" (behind), "<>" (ahead and behind), - or "=" (in sync). `:track` also prints "[gone]" whenever - unknown upstream ref is encountered. Append `:track,nobracket` - to show tracking information without brackets (i.e "ahead N, - behind M"). Has no effect if the ref does not have tracking - information associated with it. All the options apart from - `nobracket` are mutually exclusive, but if used together the - last option is selected. + from the displayed ref. Respects `:short` and `:strip` in the + same way as `refname` above. Additionally respects `:track` + to show "[ahead N, behind M]" and `:trackshort` to show the + terse version: ">" (ahead), "<" (behind), "<>" (ahead and + behind), or "=" (in sync). `:track` also prints "[gone]" + whenever unknown upstream ref is encountered. Append + `:track,nobracket` to show tracking information without + brackets (i.e "ahead N, behind M"). Has no effect if the ref + does not have tracking information associated with it. All + the options apart from `nobracket` are mutually exclusive, but + if used together the last option is selected. push:: - The name of a local ref which represents the `@{push}` location - for the displayed ref. Respects `:short`, `:track`, and - `:trackshort` options as `upstream` does. Produces an empty - string if no `@{push}` ref is configured. + The name of a local ref which represents the `@{push}` + location for the displayed ref. Respects `:short`, `:strip`, + `:track`, and `:trackshort` options as `upstream` + does. Produces an empty string if no `@{push}` ref is + configured. HEAD:: '*' if HEAD matches current ref (the checked out branch), ' ' |