summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-19 22:41:30 -0700
committerJunio C Hamano <gitster@pobox.com>2010-04-19 22:41:30 -0700
commitddd02b70f0d80fc3cac6b2f2c42005560d572413 (patch)
tree0bd6765c742b6622b6d81587b6ddd98d5062e9eb /compat
parent5469e2dab133a197dc2ca2fa47eb9e846ac19b66 (diff)
parent3d8167677ddd71405906409994a72306ba993a1f (diff)
downloadgit-ddd02b70f0d80fc3cac6b2f2c42005560d572413.tar.gz
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
Diffstat (limited to 'compat')
-rw-r--r--compat/vcbuild/include/termios.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/compat/vcbuild/include/termios.h b/compat/vcbuild/include/termios.h
new file mode 100644
index 0000000000..0d8552a2c6
--- /dev/null
+++ b/compat/vcbuild/include/termios.h
@@ -0,0 +1 @@
+/* Intentionally empty file to support building git with MSVC */