diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-12-06 11:07:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-06 11:07:21 -0800 |
| commit | cb6bd5722f430b225b894920fd80975ffa1d0bb5 (patch) | |
| tree | b83e0610f305c21cd50ec4e5a5d2dc8625c02af3 /Documentation/git-merge-file.txt | |
| parent | Merge branch 'jc/bundle' (diff) | |
| parent | for-each-ref: avoid color leakage (diff) | |
| download | tgif-cb6bd5722f430b225b894920fd80975ffa1d0bb5.tar.xz | |
Merge branch 'rr/for-each-ref-decoration'
Add a few formatting directives to "git for-each-ref --format=...",
to paint them in color, etc.
* rr/for-each-ref-decoration:
for-each-ref: avoid color leakage
for-each-ref: introduce %(color:...) for color
for-each-ref: introduce %(upstream:track[short])
for-each-ref: introduce %(HEAD) asterisk marker
t6300 (for-each-ref): don't hardcode SHA-1 hexes
t6300 (for-each-ref): clearly demarcate setup
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions