From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Dec 2011 21:34:18 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.9-rc0~87
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51f737e350c79ddf45616fa023692fa557363434;p=thirdparty%2Fgit.git

Merge branch 'maint'

* maint:
  am: don't persist keepcr flag
  mingw: give waitpid the correct signature
  git symbolic-ref: documentation fix
---

51f737e350c79ddf45616fa023692fa557363434