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

diff --cc Documentation/rev-list-options.txt
Simple merge

diff --cc Documentation/user-manual.txt
Simple merge

diff --cc builtin-reflog.c
Simple merge