Merge branch 'jc/request-pull-show-head-4'
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Dec 2011 21:37:05 +0000 (13:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Dec 2011 21:37:05 +0000 (13:37 -0800)
commita4043aeafed7962716a513e38ca1d5e192e7e831
treee48b94c2e8073ad86e2e8e0801766e217e0397b1
parent1ee740e66975adbab080301ebd364e253be3d513
parentd050464541d51ab65863218d93b351de3392f476
Merge branch 'jc/request-pull-show-head-4'

* jc/request-pull-show-head-4:
  request-pull: use the annotated tag contents
  fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error
  environment.c: Fix an sparse "symbol not declared" warning
  builtin/log.c: Fix an "Using plain integer as NULL pointer" warning
  fmt-merge-msg: use branch.$name.description
  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
Makefile
branch.c
builtin/branch.c
builtin/fmt-merge-msg.c
builtin/merge.c
environment.c