summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Chris Parsons <chris@edendevelopment.co.uk>2008-05-22 08:50:02 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-05-22 23:51:22 -0700
commit950ce2e22db4a3c1ff9ad598b46ccb22c517a336 (patch)
tree049fd11a2346c2ec1c20ce0787f8eaf6b97dce44 /git-merge-resolve.sh
parentpull --rebase: exit early when the working directory is dirty (diff)
downloadtgif-950ce2e22db4a3c1ff9ad598b46ccb22c517a336.tar.xz
Updated status to show 'Not currently on any branch' in red
This provides additional warning to users when attempting to commit to a detached HEAD. It is configurable in color.status.nobranch. Signed-off-by: Chris Parsons <chris@edendevelopment.co.uk> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions