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)
commit7173ad76edfb016500cc7a97f35b067964085ac8
treea5587df7cf3ca92d793a6e32bba63d27674bc1e2
parentc8704ad33534b40e14c412f36f83f64cfcbf0359
parent6f1871fe0f7d9bddfbe199cceeb255cf8edbaab3
Merge branch 'jd/subtree'

* 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)