diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-06-06 11:32:21 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-06-06 11:32:21 -0700 |
commit | 7173ad76edfb016500cc7a97f35b067964085ac8 (patch) | |
tree | a5587df7cf3ca92d793a6e32bba63d27674bc1e2 /git-difftool.perl | |
parent | c8704ad33534b40e14c412f36f83f64cfcbf0359 (diff) | |
parent | 6f1871fe0f7d9bddfbe199cceeb255cf8edbaab3 (diff) | |
download | git-7173ad76edfb016500cc7a97f35b067964085ac8.tar.gz |
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)
Diffstat (limited to 'git-difftool.perl')
0 files changed, 0 insertions, 0 deletions