From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Jun 2014 18:32:21 +0000 (-0700)
Subject: Merge branch 'jd/subtree'
X-Git-Tag: v2.1.0-rc0~156
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7173ad76edfb016500cc7a97f35b067964085ac8;p=thirdparty%2Fgit.git

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

7173ad76edfb016500cc7a97f35b067964085ac8