Merge branch 'maint'

* maint:
  git-gui: Make sure we get errors from git-update-index

Conflicts:

	lib/index.tcl
tree: c26e1fb74f3b94585e5946bcc623b322fd9d2cbe
  1. lib/
  2. macosx/
  3. po/
  4. windows/
  5. .gitignore
  6. git-gui.sh
  7. GIT-VERSION-GEN
  8. Makefile