From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 29 Nov 2007 01:06:57 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.4-rc0~136
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9?ds=inline;hp=d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9

Merge branch 'maint'

* maint:
scripts: do not get confused with HEAD in work tree
Improve description of git-branch -d and -D in man page.
---