Merge branch 'maint'

* maint:
  git-gui: Allow as few as 0 lines of diff context
tree: 8ab2a8437233dd6591593672d6e18d57d5cee43c
  1. lib/
  2. .gitignore
  3. git-gui.sh
  4. GIT-VERSION-GEN
  5. Makefile