From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 Aug 2008 07:53:31 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.0-rc3~13
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=10d9d887ecdc81197162d7bbe5dfc0d028498fd6;p=git.git

Merge branch 'maint'

* maint:
  Documentation: fix invalid reference to 'mybranch' in user manual
  Fix deleting reflog entries from HEAD reflog
  reflog test: add more tests for 'reflog delete'
  Documentation: rev-list-options: Fix -g paragraph formatting

Conflicts:
	Documentation/user-manual.txt
---

10d9d887ecdc81197162d7bbe5dfc0d028498fd6