Kenneth: Created page with "== Git vs Mercurial Table == {|class="wikitable" !Git !Mercurial |- |git pull |hg pull -u |- |git fetch |hg pull |- |git reset --hard |hg update -C |- |git revert ..."

2015-03-07T17:00:14Z

Created page with "== Git vs Mercurial Table == {|class="wikitable" !Git !Mercurial |- |git pull |hg pull -u |- |git fetch |hg pull |- |git reset --hard |hg update -C |- |git revert <commit> ..."

New page

== Git vs Mercurial Table ==

{|class="wikitable"
!Git
!Mercurial
|-
|git pull
|hg pull -u
|-
|git fetch
|hg pull
|-
|git reset --hard
|hg update -C
|-
|git revert <commit>
|hg backout <cset>
|-
|git add <new_file>
|hg add <new_file> (Only equivalent when <new_file> is not tracked.)
|-
|git add <file>
|Not necessary in Mercurial.
|-
|git reset
|Not necessary in Mercurial.
|-
|git add -i
|hg record
|-
|git commit -a
|hg commit
|-
|git commit --amend
|hg commit --amend
|-
|git blame
|hg blame or hg annotate
|-
|git blame -C
|(closest equivalent): hg grep --all
|-
|git bisect
|hg bisect
|-
|git rebase --interactive
|hg histedit <base cset> (Requires the HisteditExtension.)
|-
|git stash
|hg shelve (Requires the ShelveExtension or the AtticExtension.)
|-
|git merge
|hg merge
|-
|git cherry-pick <commit>
|hg graft <cset>
|-
|git rebase <upstream>
|hg rebase -d <cset> (Requires the RebaseExtension.)
|-
|git format-patch <commits> and git send-mail
|hg email -r <csets> (Requires the PatchbombExtension.)
|-
|git am <mbox>
|hg mimport -m <mbox> (Requires the MboxExtension and the MqExtension. Imports patches to mq.)
|-
|git checkout HEAD
|hg update
|-
|git log -n
|hg log --limit n
|-
|git push
|hg push
|}

Source: Git vs Mercurial - WikiVS - http://www.wikivs.com/wiki/Git_vs_Mercurial

== Command equivalence table ==

<table border="1">
<tr> <th>Git command </th>
<th>Hg command </th>
<th>Notes </th>
</tr>
<tr> <td><tt class="backtick">git pull</tt> </td>
<td><tt class="backtick">hg fetch</tt> 
<tt class="backtick">hg pull -u</tt> </td>
<td>The fetch command is more similar but requires the <a href="/wiki/FetchExtension">FetchExtension</a> to be enabled. </td>
</tr>
<tr> <td><tt class="backtick">git fetch</tt> </td>
<td><tt class="backtick">hg pull</tt> </td>
<td> </td>
</tr>
<tr> <td><tt class="backtick">git push</tt> </td>
<td><tt class="backtick">hg push -r .</tt> </td>
<td>By default, git only pushes the current branch. </td>
</tr>
<tr> <td><tt class="backtick">git checkout <commit></tt> </td>
<td><tt class="backtick">hg update -c <cset></tt> </td>
<td>git checks and reloads (accidentally) removed files </td>
</tr>
<tr> <td><tt class="backtick">git checkout [<rev>] -- <file(s)></tt> </td>
<td><tt class="backtick">hg revert [-r <rev>] <file(s)></tt> </td>
<td> </td>
</tr>
<tr> <td><tt class="backtick">git reset --hard</tt> </td>
<td><tt class="backtick">hg revert -a --no-backup</tt> </td>
<td> </td>
</tr>
<tr> <td><tt class="backtick">git reset --hard HEAD~1</tt> </td>
<td><tt class="backtick">hg strip -r .</tt> </td>
<td> </td>
</tr>
<tr> <td><tt class="backtick">git revert <commit></tt> </td>
<td><tt class="backtick">hg backout <cset></tt> </td>
<td> </td>
</tr>
<tr> <td><tt class="backtick">git add <new_file></tt> </td>
<td><tt class="backtick">hg add <new_file></tt> </td>
<td>Only equivalent when <tt class="backtick"><new_file></tt> is not tracked. </td>
</tr>
<tr> <td><tt class="backtick">git add <file></tt> 
<tt class="backtick">git reset HEAD <file></tt> </td>
<td>— </td>
<td>Not necessary in Mercurial (see <tt class="backtick">shelve</tt> below for partial commit support). </td>
</tr>
<tr> <td><tt class="backtick">git add -i</tt> </td>
<td><tt class="backtick">hg record</tt> </td>
<td>Requires the <a href="/wiki/RecordExtension">RecordExtension</a> to be enabled. </td>
</tr>
<tr> <td><tt class="backtick">git commit --amend</tt> </td>
<td><tt class="backtick">hg commit --amend</tt> </td>
<td> </td>
</tr>
<tr> <td><tt class="backtick">git rebase --interactive</tt> </td>
<td><tt class="backtick">hg histedit <base cset></tt> </td>
<td>Requires the <a href="/wiki/HisteditExtension">HisteditExtension</a>. 
In core since version 2.3 </td>
</tr>
<tr> <td><tt class="backtick">git stash</tt> </td>
<td><tt class="backtick">hg shelve</tt> </td>
<td>Requires the <a href="/wiki/ShelveExtension">ShelveExtension</a> or the <a href="/wiki/AtticExtension">AtticExtension</a>. </td>
</tr>
<tr> <td><tt class="backtick">git merge</tt> </td>
<td><tt class="backtick">hg merge</tt> </td>
<td>git merge is capable of octopus merges, while mercurial merge prefers multiple merges </td>
</tr>
<tr> <td><tt class="backtick">git cherry-pick <commit></tt> </td>
<td><tt class="backtick">hg transplant <cset></tt> 
<tt class="backtick">hg graft <csets></tt> </td>
<td>Transplant requires the <a href="/wiki/TransplantExtension">TransplantExtension</a>. 
Graft is available in 2.0 and higher. </td>
</tr>
<tr> <td><tt class="backtick">git rebase <upstream></tt> </td>
<td><tt class="backtick">hg rebase -d <cset></tt> </td>
<td>Requires the <a href="/wiki/RebaseExtension">RebaseExtension</a>. </td>
</tr>
<tr> <td><tt class="backtick">git format-patch <commits></tt> and <tt class="backtick">git send-mail</tt> </td>
<td><tt class="backtick">hg email -r <csets></tt> </td>
<td>Requires the <a href="/wiki/PatchbombExtension">PatchbombExtension</a>. </td>
</tr>
<tr> <td><tt class="backtick">git am <mbox></tt> </td>
<td><tt class="backtick">hg mimport -m <mbox></tt> </td>
<td>Requires the <a href="/wiki/MboxExtension">MboxExtension</a> and the <a href="/wiki/MqExtension">MqExtension</a>. Imports patches to mq. </td>
</tr>
<tr> <td><tt class="backtick">git describe</tt> </td>
<td><tt class="backtick">hg log -r . --template '{latesttag}-{latesttagdistance}-{node|short}\n'</tt> </td>
<td> </td>
</tr>
<tr> <td><tt class="backtick">git describe rev</tt> </td>
<td><tt class="backtick">hg log -r rev --template '{latesttag}-{latesttagdistance}-{node|short}\n'</tt> </td>
<td> </td>
</tr>
<tr> <td><tt class="backtick">git log origin..HEAD</tt> 
<tt class="backtick">git log origin/foobranch..HEAD</tt> </td>
<td><tt class="backtick">hg outgoing</tt> </td>
<td> </td>
</tr>
<tr> <td><tt class="backtick">git fetch && git log HEAD..origin</tt> </td>
<td><tt class="backtick">hg incoming</tt> </td>
<td><tt class="backtick">git fetch</tt> keeps the changesets while <tt class="backtick">hg incoming</tt> (without <tt class="backtick">--bundle foo</tt>) discards them. Use <tt class="backtick">git pull</tt> (will fetch further changes) or <tt class="backtick">git merge origin</tt> to update the working directory </td>
</tr>
<tr> <td><tt class="backtick">git show rev</tt> </td>
<td><tt class="backtick">hg export rev</tt> </td>
<td> </td>
</tr>
<tr> <td><tt class="backtick">git show hash:file</tt> </td>
<td><tt class="backtick">hg cat -r rev file</tt> </td>
<td> </td>
</tr>
<tr> <td><tt class="backtick">git ls-files</tt> </td>
<td><tt class="backtick">hg manifest</tt> </td>
<td> </td>
</tr>
<tr> <td><tt class="backtick">git log</tt> </td>
<td><tt class="backtick">hg log</tt> </td>
<td> </td>
</tr>
<tr> <td><tt class="backtick">git log -n</tt> </td>
<td><tt class="backtick">hg log --limit n</tt> </td>
<td> </td>
</tr>
<tr> <td><tt class="backtick">git ??</tt> </td>
<td><tt class="backtick">hg summary</tt> </td>
<td> </td>
</tr>
<tr> <td><tt class="backtick">git status</tt> </td>
<td><tt class="backtick">hg outgoing</tt> 
<tt class="backtick">hg status</tt> </td>
<td> </td>
</tr>
<tr> <td><tt class="backtick">git remote add -f remotename url</tt> </td>
<td>— </td>
<td>Edit .hg/hgrc and add the line 'remotename = url' under section '[paths]'; see below for getting changesets </td>
</tr>
<tr> <td><tt class="backtick">git remote update remotename</tt> </td>
<td><tt class="backtick">hg pull remotename</tt> </td>
<td>When <tt class="backtick">remotename</tt> is omitted in Git, all remotes are updated. In Mercurial, the default remote is refreshed. </td>
</tr>
<tr> <td><tt class="backtick">git branch -a</tt> </td>
<td><tt class="backtick">hg branches</tt> </td>
<td> </td>
</tr>
<tr> <td><tt class="backtick">git config --global user.(name|email) ...</tt> </td>
<td>— </td>
<td>Edit <tt class="backtick">~/.hgrc</tt> section "[ui]", key "username", value "First Last < <a class="mailto" href="mailto:mail@example.org">mail@example.org</a> >" </td>
</tr>
<tr> <td><tt class="backtick">git clean</tt> or 
<tt class="backtick">git status --porcelain|sed -r 's:\?\?\s(.*):\1:g'|xargs rm</tt> </td>
<td><tt class="backtick">hg purge</tt> or 
<tt class="backtick">hg status -un|xargs rm</tt> </td>
<td><tt class="backtick">purge</tt> requires the <a href="/wiki/PurgeExtension">PurgeExtension</a> 
In Windows you might need to add <tt class="backtick">sed 's:\\:/:g'</tt> before piping <tt class="backtick">xargs rm</tt>, otherwise the inverted slash in Windows paths will be interpreted as an escape </td>
</tr>
</table>

Source: GitConcepts - Mercurial - http://mercurial.selenic.com/wiki/GitConcepts#Command_equivalence_table

Git vs Mercurial - Revision history

Kenneth: Created page with "== Git vs Mercurial Table == {|class="wikitable" !Git !Mercurial |- |git pull |hg pull -u |- |git fetch |hg pull |- |git reset --hard |hg update -C |- |git revert ..."