Git equivalents of most common Mercurial commands?

by

The Git-HG rosetta stone is not bad

There are a few other gotchas between the two not mentioned there. This list was cribbed from my own blog post when I went the other way (git -> hg).

Hg .hgignore, syntax: glob is the same behaviour as git’s .gitignore.

Git .git/config, ~/.gitconfig, use git-config to modify the values
Hg .hg/hgrc, ~/.hgrc, use hg help -c config

Git git commit -v<br>
Hg hg diff | less; hg commit

Git gitk<br>
Hg hg view, or thg from [TortoiseHg][1]

Git git gui<br>
Hg Mercurial doesn’t ship GUI to select changesets, only console hg record command.

Git git rebase<br>
Hg hg rebase. For git rebase --interactive there’s hg histedit, or Mercurial Queues

Git git push URL ; git remote add origin URL<br>
Hg hg push URL; $EDITOR .hg/hgrc ; [paths] default = URL

Git gitk, git log origin/master..HEAD<br>
Hg hg outgoing

Git git format-patch RANGE<br>
Hg hg email -m filename -o

Git git add . ; Note the dot
Hg hg add ; No dot needed.

Git git checkout REVISION-KEY<br>
Hg hg update CHANGESET

Just to fill the blanks, some of the most useful commands from Mercurial:

Hg hg record
Git git add -p; git commit

Hg hg inc [URL]
Git No real equivalent. You can only do equivalent of hg pull; hg log -r .:

Hg hg out URL
Git Please add if you know how.

For merge conflict resolution, the hg resolve command in Mercurial has a few options that change the behaviour:

Hg hg resolve -m FILE (marks the file as having been resolved by manually fixing up the conflict problem)
Git git add FILE

Hg hg resolve -u FILE marks the file as having been unresolved
Git git reset HEAD FILE to unstage the file

Hg hg resolve -l (lists files with resolved/unresolved conflicts)
Git git status – files that merged cleanly are added to the index automatically, those that are not have conflicts

Hg hg resolve FILE (after a merge, attempts to re-merge the file)
Git no equivalent for re-merging that I know of.

More Related Contents:

  1. Distributed Version Control Systems and the Enterprise – a Good mix? [closed]
  2. Partial clone with Git and Mercurial
  3. Git and Mercurial – Compare and Contrast
  4. Merging: Hg/Git vs. SVN
  5. What is the Difference Between Mercurial and Git?
  6. How to export revision history from mercurial or git to cvs?
  7. How to search through all Git and Mercurial commits in the repository for a certain string?
  8. Git interoperability with a Mercurial Repository
  9. Convert Mercurial project to Git [duplicate]
  10. Hg: How to do a rebase like git’s rebase
  11. Using Git how do I find changes between local and remote
  12. Mercurial (and, I guess Git) with Dropbox: any drawbacks?
  13. Transferring legacy code base from cvs to distributed repository (e.g. git or mercurial). Suggestions needed for initial repository design [closed]
  14. Is there a way to use a Mercurial repository as Git submodule?
  15. Diffing between two entire directories/projects in hg or git?
  16. How can I selectively merge or pick changes from another branch in Git?
  17. Git: How to solve Permission denied (publickey) error when using Git?
  18. How to undo ‘git reset’?
  19. How to convert a Git shallow clone to a full clone?
  20. git pull while not in a git directory
  21. How to prune local tracking branches that do not exist on remote anymore
  22. My Git repository is in the wrong root directory. Can I move it? (../ instead of ./)
  23. git log output encoding issues on Windows 10 CLI terminal
  24. Multiple staging areas
  25. Git: auto pull from repository?
  26. GitHub changes repository to the wrong language
  27. How to force push a reset to remote repository?
  28. How resolve multiple conflicts with “git mergetool” without having to close the editor between files?
  29. Is there a way to compare two diffs or patches?
  30. How to temporarily disable git http proxy

Leave a Comment