diff options
| author | Ramkumar Ramachandra <artagnon@gmail.com> | 2013-11-18 23:09:11 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-11-19 10:14:15 -0800 |
| commit | b28061ce0d2e31d390fee5a5724b8a061d0492a7 (patch) | |
| tree | ffd06a2811065c442744dee721f0646fb0592092 /t/t6037-merge-ours-theirs.sh | |
| parent | 7a48b8321934384098a8392b3c4c814ec5058d00 (diff) | |
| download | git-b28061ce0d2e31d390fee5a5724b8a061d0492a7.tar.gz | |
for-each-ref: introduce %(upstream:track[short])
Introduce %(upstream:track) to display "[ahead M, behind N]" and
%(upstream:trackshort) to display "=", ">", "<", or "<>"
appropriately (inspired by contrib/completion/git-prompt.sh).
Now you can use the following format in for-each-ref:
%(refname:short)%(upstream:trackshort)
to display refs with terse tracking information.
Note that :track and :trackshort only work with "upstream", and error
out when used with anything else.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions