From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 20 Apr 2010 05:41:30 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddd02b70f0d80fc3cac6b2f2c42005560d572413;p=thirdparty%2Fgit.git

Merge branch 'maint'

* maint:
  t7012: Mark missing tests as TODO
  reflog: remove 'show' from 'expire's usage string
  MSVC: Fix build by adding missing termios.h dummy
---

ddd02b70f0d80fc3cac6b2f2c42005560d572413