Merge branch 'jd/subtree'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:32:21 +0000 (11:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:32:21 +0000 (11:32 -0700)
* jd/subtree:
  contrib/subtree: allow adding an annotated tag
  contrib/subtree/Makefile: clean up rule for "clean"
  contrib/subtree/Makefile: clean up rules to generate documentation
  contrib/subtree/Makefile: s/libexecdir/gitexecdir/
  contrib/subtree/Makefile: use GIT-VERSION-FILE
  contrib/subtree/Makefile: scrap unused $(gitdir)


Trivial merge