Merge branch 'maint'
commit25487f8e2ae266936df0f807ae79dca41606e404
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Feb 2009 19:31:52 +0000 (18 11:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Feb 2009 19:31:52 +0000 (18 11:31 -0800)
treedcea5cb274c0618e742644b5cd7b0615202819b7
parent88e38808cd52aaed327a82d6a6ffdb8b9da621f2
parent91e80b984e0afda37d288e550fb5832d2b71568c
Merge branch 'maint'

* maint:
  tests: fix "export var=val"
  Skip timestamp differences for diff --no-index
  Documentation/git-push: --all, --mirror, --tags can not be combined
diff-no-index.c
t/test-lib.sh