Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Feb 2009 19:31:52 +0000 (11:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Feb 2009 19:31:52 +0000 (11:31 -0800)
* maint:
  tests: fix "export var=val"
  Skip timestamp differences for diff --no-index
  Documentation/git-push: --all, --mirror, --tags can not be combined

1  2 
diff-no-index.c
t/test-lib.sh

diff --cc diff-no-index.c
Simple merge
diff --cc t/test-lib.sh
Simple merge