summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-03-20 13:51:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-20 13:51:24 -0700
commit46d403f13e5cb6d2b6bee6f942a679ea8978b9fa (patch)
tree4ac41e65ede4c08e75c19f6c51195d4a853bcb14 /git-merge-resolve.sh
parentMerge branch 'jc/decorate-leaky-separator-color' (diff)
parentlog: decorate HEAD with branch name (diff)
downloadtgif-46d403f13e5cb6d2b6bee6f942a679ea8978b9fa.tar.xz
Merge branch 'mg/log-decorate-HEAD'
Output from "git log --decorate" mentions HEAD when it points at a tip of an branch differently from a detached HEAD. This is a potentially backward-incompatible change. * mg/log-decorate-HEAD: log: decorate HEAD with branch name
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions