aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/persistent-https
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-04 15:51:23 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-04 15:51:23 -0700
commit59b2389c324dbbb335bd3375d950433b600eee90 (patch)
tree3bebaa5ac1c31664d0a3f140c8c4d5a863b6cb59 /contrib/persistent-https
parentSync with 1.7.5.1 (diff)
parentmergetool: Teach about submodules (diff)
downloadgit-59b2389c324dbbb335bd3375d950433b600eee90.tar.gz
git-59b2389c324dbbb335bd3375d950433b600eee90.zip
Merge branch 'jm/mergetool-submodules'
* jm/mergetool-submodules: mergetool: Teach about submodules
Diffstat (limited to 'contrib/persistent-https')
0 files changed, 0 insertions, 0 deletions