aboutsummaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-22 10:28:43 -0700
committerJunio C Hamano <gitster@pobox.com>2014-07-22 10:28:43 -0700
commit514dd21326db3d0f429b9fa9cd5fdbd0d2c417d1 (patch)
tree7a08243024fa1c473c549ba25b490e20c7e4516e /git-merge-one-file.sh
parent5796c5baa3ef0a7d179fdac6cb5815f75f65fd53 (diff)
parent42c55ce49eb3c8741f62a0abdfb38182d461126c (diff)
downloadgit-514dd21326db3d0f429b9fa9cd5fdbd0d2c417d1.tar.gz
git-514dd21326db3d0f429b9fa9cd5fdbd0d2c417d1.tar.xz
Merge branch 'mg/fix-log-mergetag-color' into maint
* mg/fix-log-mergetag-color: log: correctly identify mergetag signature verification status
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions