![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Oct 2011 19:36:27 +0000 (12:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Oct 2011 19:36:27 +0000 (12:36 -0700) | ||
| commit | 2e49dab8a114fb8c7dafdd1cda3a8bba0afe94a5 | |
| tree | c55e0b1fe1bdcf6fcdebefa9d1eb04550e3738d6 | tree | snapshot |
| parent | 83d6b33db649f8e0eb96c12e61f518ddfbdfa6f5 | commit | diff |
| parent | 1d6abac9d573d7a40d3e631253b67a7cb07e0d05 | commit | diff |
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)
* 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)