Distributed version control with git a brief introduction

Transcription

1 Distributed version control with git a brief introduction Oscar Nierstrasz

2 Why git?

3 Bob

4 Bob Carol

5 Bob Carol Alice Ted

6 Bob Carol Alice Ted A recipe for disaster!

7 The git object model

8 A is content under version control (a file)

9 You can have trees of s (directories of files) tree tree

10 A commit is a tree of s (a set of changes) commit tree tree

11 Most commits modify (or merge) earlier commits commit tree tree commit tree

12 You can tag an interesting commit tag commit tree tree commit tree

13 A graph of commits may belong to a branch branch tag commit tree tree commit tree

14 HEAD is the current branch HEAD branch tag commit tree tree commit tree

15 HEAD branch commit commit Let s focus on commits and branches

16 Basic git

17 Create a git repo mkdir repo cd repo git init HEAD

18 Tell git to stage HEAD changes git add

19 HEAD Commit your changes git commit

20 Collaborating

21 John Jane Local repo Public repo Local repo

22 John Jane Local repo Public repo Local repo git clone git clone

23 John Jane Local repo Public repo Local repo C3 git add git commit git add git commit

24 John Jane Local repo Public repo Local repo git pull C3 (nothing new to pull)

25 John Jane Local repo Public repo Local repo git push C3

26 John Jane Local repo Public repo Local repo git fetch C3

27 John Jane Local repo Public repo Local repo git merge C4 C3 NB: git pull = fetch + merge

28 John Jane Local repo Public repo Local repo git push C4 C4 C3 C3

29 John Jane Local repo Public repo Local repo git pull C4 C4 C4 C3 C3 C3

30 Branching and merging

31 origin refers to the remote repo HEAD origin/

32 HEAD origin/ git commit

33 HEAD git branch tryout tryout origin/

34 git checkout tryout HEAD tryout origin/ NB: git checkout b = branch + checkout

35 HEAD tryout origin/ C3 git commit

36 HEAD tryout C3 C5 origin/ C4 C6 origin/idea git fetch origin

37 git merge origin/ origin/idea HEAD tryout C7 C3 C5 origin/ C4 C6 origin/idea

38 git checkout HEAD tryout C7 C3 C5 origin/ C4 C6 origin/idea

39 git merge HEAD tryout C8 C7 C3 C5 origin/ C4 C6 origin/idea

40 git push origin/ HEAD C8 C3 C4 tryout C7 C5 C6 origin/idea

41 More to git

42 More to git > Merging and mergetool > Squashing commits when merging > Resolving conflicts > User authentication with ssh > gitx and other graphical tools > git configure remembering your name > git remote multiple remote repos > github an open source public repo > 42

43 Resources

44 Attribution-ShareAlike 3.0 You are free: to copy, distribute, display, and perform the work to make derivative works to make commercial use of the work Under the following conditions: Attribution. You must attribute the work in the manner specified by the author or licensor. Share Alike. If you alter, transform, or build upon this work, you may distribute the resulting work only under a license identical to this one. For any reuse or distribution, you must make clear to others the license terms of this work. Any of these conditions can be waived if you get permission from the copyright holder. Your fair use and other rights are in no way affected by the above.