summaryrefslogtreecommitdiff
path: root/GIT-VERSION-GEN
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-05 19:36:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-05 19:36:27 (GMT)
commit2e49dab8a114fb8c7dafdd1cda3a8bba0afe94a5 (patch)
treec55e0b1fe1bdcf6fcdebefa9d1eb04550e3738d6 /GIT-VERSION-GEN
parent83d6b33db649f8e0eb96c12e61f518ddfbdfa6f5 (diff)
parent1d6abac9d573d7a40d3e631253b67a7cb07e0d05 (diff)
downloadgit-2e49dab8a114fb8c7dafdd1cda3a8bba0afe94a5.zip
git-2e49dab8a114fb8c7dafdd1cda3a8bba0afe94a5.tar.gz
git-2e49dab8a114fb8c7dafdd1cda3a8bba0afe94a5.tar.bz2
Merge branch 'mm/mediawiki-as-a-remote'
* mm/mediawiki-as-a-remote: git-remote-mediawiki: allow a domain to be set for authentication git-remote-mediawiki: obey advice.pushNonFastForward git-remote-mediawiki: set 'basetimestamp' to let the wiki handle conflicts git-remote-mediawiki: trivial fixes git-remote-mediawiki: allow push to set MediaWiki metadata Add a remote helper to interact with mediawiki (fetch & push)
Diffstat (limited to 'GIT-VERSION-GEN')
0 files changed, 0 insertions, 0 deletions