Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 Aug 2008 07:53:31 +0000 (00:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Aug 2008 07:53:31 +0000 (00:53 -0700)
commit10d9d887ecdc81197162d7bbe5dfc0d028498fd6
treef726621f79162565bf066400df697a078680601a
parent71b9979bc74b66c1cf961d5c74de5c0b3cbf00a4
parent4f80b27d48fee1c588810f3341ffe5d14558cea2
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
Documentation/rev-list-options.txt
Documentation/user-manual.txt
builtin-reflog.c