Code

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)
* 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

1  2 
Documentation/rev-list-options.txt
Documentation/user-manual.txt
builtin-reflog.c

Simple merge
Simple merge
Simple merge