The document provides a brief history of revision control systems including SCCS, RCS, CVS, Subversion, and distributed systems like Git, Mercurial, and Bazaar. It discusses the problems with earlier systems that motivated the creation of Git, including issues with CVS and Subversion. It describes how Linus Torvalds created Git to address these problems and support fast, distributed, and non-linear development workflows.

1. git --intro lenin.gil lenin.gif lenin.budet.git

19. The Object Model

22. History is a DAG To keep all the information and history on the three versions of this tree, Git stores 16 immutable , signed , compressed objects.

26. The Model

27. Local branching

28. Local branching

32. Real workflow example

34. git init c:gt; mkdir test c:gt; cd test c:est> git init Initialized empty Git repository in c:/test/.git/

35. git add c:est> dir /b cities.cpp cities.h c:est> git add cities.h c:est> git status # On branch master # # Initial commit # # Changes to be committed: # (use &quot;git rm --cached <file>...&quot; to unstage) # # new file: cities.h # # Untracked files: # (use &quot;git add <file>...&quot; to include in what will be committed) # # cities.cpp

36. git commit c:est> git commit -m &quot;first commit&quot; [master (root-commit) 207b79d] first commit 1 files changed, 44 insertions(+), 0 deletions(-) create mode 100644 cities.h c:est> git status # On branch master # Untracked files: # (use &quot;git add <file>...&quot; to include in what will be committed) # # cities.cpp nothing added to commit but untracked files present (use &quot;git add&quot; to track)

37. git commit -a c:est> git status # On branch master nothing to commit (working directory clean) c:est> echo &quot;aaa&quot; > cities.cpp c:est> git commit -m &quot;test&quot; # 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: cities.cpp # no changes added to commit (use &quot;git add&quot; and/or &quot;git commit -a&quot;) c:est> git commit -m &quot;test&quot; -a [master 6eaf41e] test 1 files changed, 1 insertions(+), 210 deletions(-) rewrite cities.cpp (100%)

38. change-> add -> commit

39. git log c:est> git commit Aborting commit due to empty commit message. c:est> git log commit 57e762203d0b522fa3a47afcc907af313b5d6d78 Author: Dmitry Guyvoronsky <dmitry.guyvoronsky@gmail.com> Date: Fri Feb 25 16:18:15 2011 +0200 second commit commit 207b79dd89469a75c9e92a38c4b3eac904bea603 Author: Dmitry Guyvoronsky <dmitry.guyvoronsky@gmail.com> Date: Fri Feb 25 16:15:17 2011 +0200 first commit c:est> git log --pretty=oneline 57e762203d0b522fa3a47afcc907af313b5d6d78 second commit 207b79dd89469a75c9e92a38c4b3eac904bea603 first commit

40. git branch c:est> git status # On branch master nothing to commit (working directory clean) c:est> git branch * master c:est> git branch mytest c:est> git branch * master mytest c:est> git checkout mytest Switched to branch 'mytest' c:est> git branch master * mytest

41. git checkout -b c:est> git branch master * mytest c:est> git checkout -b another Switched to a new branch 'another' c:est> git branch * another master mytest

48. git clone c:est> git clone git@dreamiurg.unfuddle.com:dreamiurg/test.git Initialized empty Git repository in c:/test/test/.git/ remote: Counting objects: 10, done. remote: Compressing objects: 100% (10/10), done. remote: Total 10 (delta 1), reused 0 (delta 0) Receiving objects: 100% (10/10), 5.69 KiB, done. Resolving deltas: 100% (1/1), done.

49. Local branches are yours only c:estest> git branch -a * master remotes/origin/HEAD -> origin/master remotes/origin/master c:estest> git checkout -b working Switched to a new branch 'working' c:estest> git branch -a master * working remotes/origin/HEAD -> origin/master remotes/origin/master

50. git fetch ; git merge c:estest> git st # On branch master nothing to commit (working directory clean) c:estest> git fetch remote: Counting objects: 4, done. remote: Compressing objects: 100% (2/2), done. remote: Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. From dreamiurg.unfuddle.com:dreamiurg/test 3ade0ca..6309355 master -> origin/master c:estest> git st # On branch master # Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded. # nothing to commit (working directory clean) c:estest> git merge origin/master Updating 3ade0ca..6309355 Fast-forward new.cpp | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 new.cpp

51. git pull = git fetch ; git merge c:estest> git pull remote: Counting objects: 5, done. remote: Compressing objects: 100% (2/2), done. remote: Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. From dreamiurg.unfuddle.com:dreamiurg/test 6309355..a4212c7 master -> origin/master Updating 6309355..a4212c7 Fast-forward new.cpp | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)

54. Graphical interfaces - gitk

55. Graphical interfaces - TortoiseGit

56. Graphical interfaces - SmartGit

61. [email_address] http://demiurg.com.ua