aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/persistent-https
diff options
context:
space:
mode:
authorAvery Pennarun <apenwarr@gmail.com>2010-06-24 02:11:04 -0400
committerAvery Pennarun <apenwarr@gmail.com>2010-06-24 02:11:04 -0400
commit8e770bd389f1810a4b1a53da51e0761ca1435f3a (patch)
tree94ab1c47218efd452a4736341cde635ad2f96597 /contrib/persistent-https
parent(Hopefully) fix PATH setting for msysgit. (diff)
parentFixed regression with splitting out new subtree (diff)
downloadgit-8e770bd389f1810a4b1a53da51e0761ca1435f3a.tar.gz
git-8e770bd389f1810a4b1a53da51e0761ca1435f3a.zip
Merge remote branch 'origin/master'
* origin/master: Fixed regression with splitting out new subtree Use 'git merge -Xsubtree' when git version >= 1.7.0.
Diffstat (limited to 'contrib/persistent-https')
0 files changed, 0 insertions, 0 deletions