Merge branch 'jc/request-pull-show-head-4' into next
commitfa5e0fe777a777e7e0d8bb0ea1a4fb5491c146f3
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2011 22:41:55 +0000 (6 15:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2011 22:41:55 +0000 (6 15:41 -0700)
tree00221c89bf255490880da74ff81f5d54fae8c659
parentc2774985d87cd4671c93ea346ff43ce826cc2131
parentc0168147831fce00975949213eef3471b7a2b76b
Merge branch 'jc/request-pull-show-head-4' into next

* jc/request-pull-show-head-4:
  request-pull: use the branch description
  request-pull: state what commit to expect
  request-pull: modernize style
  branch: teach --edit-description option
  format-patch: use branch description in cover letter
  branch: add read_branch_desc() helper function

Conflicts:
builtin/branch.c
Documentation/git-branch.txt
branch.c
builtin/branch.c