Skip to content

Commit

Permalink
Merge branch 'mm/mediawiki-as-a-remote'
Browse files Browse the repository at this point in the history
* 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)
  • Loading branch information
Junio C Hamano committed Oct 5, 2011
2 parents 83d6b33 + 1d6abac commit 2e49dab
Show file tree
Hide file tree
Showing 2 changed files with 830 additions and 0 deletions.
Loading

0 comments on commit 2e49dab

Please sign in to comment.