diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-04 13:03:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-04 13:03:50 -0700 |
| commit | bfd70c53b38f03a4e788fb84518c09f67b7514c2 (patch) | |
| tree | 4f48f0541e7a2d1ce50263e78cc5479ce52a1553 | |
| parent | 8d994db46ecd3efa1adbd401f8969f8de25fbb20 (diff) | |
| parent | 3a3101c62ecfbde184934f590bab5d84d7ae64a0 (diff) | |
| download | git-bfd70c53b38f03a4e788fb84518c09f67b7514c2.tar.gz git-bfd70c53b38f03a4e788fb84518c09f67b7514c2.tar.xz | |
Sync with maint
* maint:
mailmap: update Pasky's address
git-remote-mediawiki: new wiki URL in documentation
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | contrib/mw-to-git/git-remote-mediawiki.txt | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -73,6 +73,7 @@ Nguyễn Thái Ngọc Duy <pclouds@gmail.com> <nico@fluxnic.net> <nico@cam.org> Peter Krefting <peter@softwolves.pp.se> <peter@svarten.intern.softwolves.pp.se> Peter Krefting <peter@softwolves.pp.se> <peter@softwolves.pp.se> +Petr Baudis <pasky@ucw.cz> <pasky@suse.cz> Philippe Bruhat <book@cpan.org> Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com> Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk> diff --git a/contrib/mw-to-git/git-remote-mediawiki.txt b/contrib/mw-to-git/git-remote-mediawiki.txt index 4d211f5b8..23b7ef9f6 100644 --- a/contrib/mw-to-git/git-remote-mediawiki.txt +++ b/contrib/mw-to-git/git-remote-mediawiki.txt @@ -4,4 +4,4 @@ objects from mediawiki just as one would do with a classic git repository thanks to remote-helpers. For more information, visit the wiki at -https://github.com/Bibzball/Git-Mediawiki/wiki +https://github.com/moy/Git-Mediawiki/wiki |