Skip to content
Snippets Groups Projects
Commit 8f6bb801 authored by Dan Villiom Podlaski Christiansen's avatar Dan Villiom Podlaski Christiansen
Browse files

docs: use correct nomenclature

Refer to Mercurial by its proper name, and refer to changesets as
such.
parent 848d730b
No related branches found
No related tags found
1 merge request!68Documentation tweaks
Basic Use
---------
You can clone a Git repository from Hg by running `hg clone <url> [dest]`.
You can clone a Git repository from Mercurial by running `hg clone <url> [dest]`.
For example, if you were to run::
$ hg clone git://github.com/schacon/hg-git.git
......@@ -5,8 +5,8 @@
For example, if you were to run::
$ hg clone git://github.com/schacon/hg-git.git
Hg-Git would clone the repository and convert it to an Hg repository for
Hg-Git would clone the repository and convert it to a Mercurial repository for
you. There are a number of different protocols that can be used for Git
repositories. Examples of Git repository URLs include::
......@@ -23,9 +23,9 @@
git@github.com:hg-git/hg-git.git
Please note that you need to prepend HTTP, HTTPS, and SSH URLs with "git+"
in order differentiate them from Hg URLs. For example, an HTTPS URL would
in order differentiate them from Mercurial URLs. For example, an HTTPS URL would
start with "git+https://". Also, note that Git doesn't require the
specification of the protocol for SSH, but Mercurial does. Hg-Git
automatically detects whether file paths should be treated as Git repositories
by their contents.
......@@ -27,10 +27,10 @@
start with "git+https://". Also, note that Git doesn't require the
specification of the protocol for SSH, but Mercurial does. Hg-Git
automatically detects whether file paths should be treated as Git repositories
by their contents.
If you are starting from an existing Hg repository, you have to set up a
If you are starting from an existing Mercurial repository, you have to set up a
Git repository somewhere that you have push access to, add a path entry
for it in your .hg/hgrc file, and then run `hg push [name]` from within
your repository. For example::
......@@ -33,8 +33,8 @@
Git repository somewhere that you have push access to, add a path entry
for it in your .hg/hgrc file, and then run `hg push [name]` from within
your repository. For example::
$ cd hg-git # (an Hg repository)
$ cd hg-git # (a Mercurial repository)
$ # edit .hg/hgrc and add the target Git URL in the paths section
$ hg push
......@@ -38,8 +38,8 @@
$ # edit .hg/hgrc and add the target Git URL in the paths section
$ hg push
This will convert all your Hg data into Git objects and push them to the
Git server.
This will convert all your Mercurial changesets into Git objects and push
them to the Git server.
Pulling new revisions into a repository is the same as from any other
Mercurial source. Within the earlier examples, the following commands are
......@@ -49,9 +49,9 @@
$ hg pull default
$ hg pull git://github.com/hg-git/hg-git.git
Git branches are exposed in Hg as bookmarks, while Git remotes are exposed
as Hg local tags. See `hg help bookmarks` and `hg help tags` for further
information.
Git branches are exposed in Mercurial as bookmarks, while Git remote
branches are exposed as unchangable Mercurial local tags. See `hg help
bookmarks` and `hg help tags` for further information.
Finding and displaying Git revisions
------------------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment