Merge branch 'maint'

* maint:
  git-push: .git/remotes/ file does not require SP after colon
  git-mv: invalidate the removed path properly in cache-tree

diff --cc builtin-mv.c
Simple merge

diff --cc builtin-push.c
Simple merge