summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-06-30 11:55:40 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-30 11:55:40 -0700
commit2927a507bf8080661ed84000ce55465941bd28a9 (patch)
tree6abfc037ab5ff89d614674f9283432756dc704da /merge-file.c
parentMerge branch 'mg/doc-rev-parse-treepath-syntax' (diff)
parentAdd test for correct coloring of git log --decoration (diff)
downloadtgif-2927a507bf8080661ed84000ce55465941bd28a9.tar.xz
Merge branch 'ar/decorate-color'
* ar/decorate-color: Add test for correct coloring of git log --decoration Allow customizable commit decorations colors log --decorate: Colorize commit decorations log-tree.c: Use struct name_decoration's type for classifying decoration commit.h: add 'type' to struct name_decoration
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions