X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=pep-git.txt;h=396cd40c3cc1951a3c923ff4dda13522e2427465;hb=e1d925c680648f3bcab120371e6cf841618640da;hp=60d08b65cd08da824ce1a8b049740a6fe60bebed;hpb=56f550d92dde40538303f0011fa67cb276f197de;p=git-wiki.git

diff --git a/pep-git.txt b/pep-git.txt
index 60d08b6..396cd40 100644
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -118,7 +118,7 @@ local repo has two branches ``v1`` and ``master``. For most examples
 the currently checked out branch is ``master``. That is, it's assumed
 you have done something like that::
 
-    $ git clone http://git.python.org/python.git
+    $ git clone https://git.python.org/python.git
     $ cd python
     $ git branch v1 origin/v1
 
@@ -132,7 +132,7 @@ remotes/origin/v1 as its upstream remote-tracking branch.
 
 The same result can be achieved with commands::
 
-    $ git clone -b v1 http://git.python.org/python.git
+    $ git clone -b v1 https://git.python.org/python.git
     $ cd python
     $ git checkout --track origin/master
 
@@ -181,9 +181,9 @@ fast-forwards, merges or rebases local branches.
 
 When you do an initial clone like this::
 
-    $ git clone -b v1 http://git.python.org/python.git
+    $ git clone -b v1 https://git.python.org/python.git
 
-git clones remote repository ``http://git.python.org/python.git`` to
+git clones remote repository ``https://git.python.org/python.git`` to
 directory ``python``, creates a remote named ``origin``, creates
 remote-tracking branches, creates a local branch ``v1``, configure it
 to track upstream remotes/origin/v1 branch and checks out ``v1`` into
@@ -859,11 +859,30 @@ license).
 From Mercurial to git
 =====================
 
-Mercurial for Git users https://mercurial.selenic.com/wiki/GitConcepts
+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::
 
-https://github.com/felipec/git-remote-hg
+    $ 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
 
-https://hg-git.github.io/
+To work with the repository just use regular git commands including
+``git fetch/pull/push``.
+
+Mercurial for Git users https://mercurial.selenic.com/wiki/GitConcepts
 
 
 References