Code

Merge branch 'maint-1.7.7' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Dec 2011 21:33:39 +0000 (13:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Dec 2011 21:33:39 +0000 (13:33 -0800)
* maint-1.7.7:
  am: don't persist keepcr flag
  mingw: give waitpid the correct signature
  git symbolic-ref: documentation fix

1  2 
compat/mingw.c
compat/mingw.h
git-am.sh

diff --cc compat/mingw.c
Simple merge
diff --cc compat/mingw.h
Simple merge
diff --cc git-am.sh
Simple merge