Merge branch 'doc-rev-parse' into jk/pu

* branch doc-rev-parse:
  rev-parse(1): logically group options

Submitted upstream.
Merge branch 'rebase-i-comment-squash' into jk/pu

* branch rebase-i-comment-squash:
  rebase -i: comment first line of autosquashed message

Comment out the first line of a "!squash" commit when generating a
commit message in git-rebase.

Merged to jk/pu on 2013-03-30.  Dogfooding for a while to see if
this is a sensible change.
Merge branch 'format-patch-msgstore' into jk/pu

* branch format-patch-msgstore:
  msgstore-gmane: new Gmane message store helper
  format-patch: extract Cc recipients from in-reply-to message
  Extract RFC2822 from builtin/mailinfo.c
  rfc2822: extract header handling from mailinfo
  format-patch: dedup Cc list