summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-03-10 14:53:21 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-10 15:17:48 -0700
commit51ff0f27bc6bfe83da7304ef9db77f3a2a4a47b0 (patch)
tree704f940bc954f30ffa1491803fef24278b2b94ab /Documentation/git-merge.txt
parentMerge branch 'jc/decorate-leaky-separator-color' into HEAD (diff)
downloadtgif-51ff0f27bc6bfe83da7304ef9db77f3a2a4a47b0.tar.xz
log: decorate HEAD with branch name
Currently, log decorations do not indicate which branch is checked out and whether HEAD is detached. When branch foo is checked out, change the "HEAD, foo" part of the decorations to "HEAD -> foo". This serves to indicate both ref decorations (helped by the spacing) as well as their relationshsip. As a consequence, "HEAD" without any " -> " denotes a detached HEAD now. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions