From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Dec 2011 21:33:39 +0000 (-0800)
Subject: Merge branch 'maint-1.7.7' into maint
X-Git-Tag: v1.7.8.1~16
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=10dd3b2bf1444695416c0dac951297acf7d4e5e4;p=git.git

Merge branch 'maint-1.7.7' into maint

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

10dd3b2bf1444695416c0dac951297acf7d4e5e4