From: Junio C Hamano <junkio@cox.net>
Date: Mon, 16 Apr 2007 09:54:18 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.2-rc0~47
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=402fa75eed29c104ae5392ce88560f6bffc64ce7;p=git.git

Merge branch 'maint'

* maint:
  Have sample update hook not refuse deleting a branch through push.
  variable $projectdesc needs to be set before checking against unchanged default.
  Update git-annotate/git-blame documentation
  Update git-apply documentation
  Update git-applymbox documentation
  Update git-am documentation
  user-manual: use detached head when rewriting history
  user-manual: start revising "internals" chapter
  user-manual: detached HEAD
  user-manual: fix discussion of default clone
  Documentation: clarify track/no-track option.
  Documentation: clarify git-checkout -f, minor editing
  Documentation: minor edits of git-lost-found manpage
---

402fa75eed29c104ae5392ce88560f6bffc64ce7