X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=pep-git.txt;h=ccbe4376f9065a9f313203b54c3f2ab928e02336;hb=ab68136b8d9ac8da0cc474cfb2a6350e3ae8b79c;hp=52193f080df976c202833790ad0fb3b360a62c6b;hpb=2bbe591014a6459b53ee52628e5d5df74506b393;p=git-wiki.git

diff --git a/pep-git.txt b/pep-git.txt
index 52193f0..ccbe437 100644
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -859,17 +859,35 @@ license).
 From Mercurial to git
 =====================
 
-Mercurial for Git users https://mercurial.selenic.com/wiki/GitConcepts
-
-https://github.com/felipec/git-remote-hg
-
-https://hg-git.github.io/
-
-
-References
-==========
-
-.. [] 
+There are many tools to convert Mercurial repositories to git. The
+most famous are, perhaps, `hg-git <https://hg-git.github.io/>`_ and
+`fast-export <http://repo.or.cz/w/fast-export.git>`_ (many years ago
+it was known under the name ``hg2git``).
+
+But a better tool, perhaps the best, is `git-remote-hg
+<https://github.com/felipec/git-remote-hg>`_. It provides transparent
+bidirectional access (pull and push) to Mercurial repositories from
+git. The author wrote a `comparison of alternatives
+<https://github.com/felipec/git/wiki/Comparison-of-git-remote-hg-alternatives>`_
+that seems to be mostly unbiased.
+
+To use git-remote-hg, install or clone it, add to your PATH (or copy
+script ``git-remote-hg`` to a directory that's already in PATH) and
+prepend ``hg::`` to Mercurial URLs. For example::
+
+    $ git clone https://github.com/felipec/git-remote-hg.git
+    $ PATH=$PATH:"`pwd`"/git-remote-hg
+    $ git clone hg::https://hg.python.org/peps/ PEPs
+
+To work with the repository just use regular git commands including
+``git fetch/pull/push``.
+
+To start converting your Mercurial habits to git see the page
+`Mercurial for Git users
+<https://mercurial.selenic.com/wiki/GitConcepts>`_ at Mercurial wiki.
+At the second half of the page there is a table that lists
+corresponding Mercurial and git commands. Should work perfectly in
+both directions.
 
 
 Copyright