Version Control Systems: Mercurial and Git

1. Version Control Systems Yuriy Gerasimov Madcap B.V. [email_address]

3. CVS

5. Git

6. Bazzar

8. hg clone http://hg.serpentine.com/tutorial/hello

9. hg clone repo repo_clone

10. hg clone ssh://user@server//srv/hg/repo

12. hg diff

13. hg add

14. hg rm

15. hg addremove

17. hg rollback (rollback last commit)

18. hg update (hg update -C)

19. hg revert -r <rev> --all

20. hg tag

22. -l5 – last 5 commits

23. --graph – graph view (-G)

24. --style compact / changelog / <custom>

25. -d’Dec 9’ – date

27. hg push

28. hg heads

29. hg merge

30. Mercurial $ hg pull ../my-hello pulling from ../my-hello searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge)

31. Mercurial

34. localhost:8000

36. hg forget

37. hg blame

39. File management errors (add / remove). hg revert

41. Not last commit. hg backout --merge -m ‘message’ -<rev>

43. Meld (hg meld)

44. Fetch (hg fetch) [hooks] changegroup = hg update >&2 [extensions] hgext.extdiff = [extdiff] cmd.meld = [extensions] fetch =

46. git clone

47. git add <file> (add file to index, staging area) yuriy@dell-desktop:~/gitpresentation/repo1$ git status # On branch master # Changed but not updated: # (use &quot;git add <file>...&quot; to update what will be committed) # (use &quot;git checkout -- <file>...&quot; to discard changes in working directory) # # modified: test.txt # # Untracked files: # (use &quot;git add <file>...&quot; to include in what will be committed) # # README no changes added to commit (use &quot;git add&quot; and/or &quot;git commit -a&quot;)

49. git diff (--cached, --no-prefix)

50. git rm

52. git log –pretty=oneline --graph

53. git log --pretty=format:&quot;%h - %an, %ar : %s&quot;

57. git reset HEAD <file> – unstage file

58. git checkout -- <file> – unmodify file

62. edit

63. squash

64. reorder

66. git checkout <branch>

67. git checkout -b <branch>

68. git merge <branch>

69. git branch -d

74. git push (remote) (branch)

79. git rebase

80. hg rebase [extensions] rebase =

83. git gitweb.cgi [collections] /srv/hg = /srv/hg

85. hg-git

86. Config files .hgrc [ui] username = Yuriy Gerasimov <y.gerasimov@mdacap.nl> style = compact [extensions] hgext.extdiff = hgext.graphlog = fetch = hgext.bookmarks = rebase = hggit = /home/yuriy/programs/hg-git/hggit [git] intree = True [extdiff] cmd.meld = [bookmarks] track.current = True [auth] kiev.prefix = http://kiev.madcap.nl/hg kiev.username = yuriy kiev.password = abcd local.prefix = http://hg.yuriy-desktop local.username = yuriy local.password = abcd .gitconfig [color] ui = auto [color &quot;diff&quot;] meta = yellow bold frag = magenta bold old = red bold new = green bold whitespace = red reverse [core] whitespace=fix,-indent-with-non-tab,-indent-with-tab, trailing-space,cr-at-eol [alias] df = !git diff --no-prefix && git diff --staged --no-prefix clear = reset --hard st = status co = checkout br = branch ci = commit unstage = reset HEAD -- [user] name = Yuriy Gerasimov email = yuri.gerasimov@gmail.com

88. git: github.com

90. http://git.drupalcode.org/

91. https://github.com/drupal/drupal

94. Version Control Systems Yuriy Gerasimov Madcap B.V. [email_address]