From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Oct 2011 19:36:27 +0000 (-0700)
Subject: Merge branch 'mm/mediawiki-as-a-remote'
X-Git-Tag: v1.7.8-rc0~119
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2e49dab8a114fb8c7dafdd1cda3a8bba0afe94a5;p=git.git

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)
---

2e49dab8a114fb8c7dafdd1cda3a8bba0afe94a5