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 --cc diff-no-index.c
Simple merge

diff --cc t/test-lib.sh
Simple merge