Git Magic: Versioning Files Like a Boss. Tommy MacWilliam

Transcription

1 Git Magic: Versioning Files Like a Boss Tommy MacWilliam tmacwilliam@cs50.net

2 Today setting up like a boss basic git like a boss using branches like a boss reverting changes like a boss collaborating like a boss

3 Git is... Git is distributed version control system focused on speed, effectivity and real-world usability on large projects distributed development non-linear development efficient handling of large projects cryptographic authentication of history

4 Git is... Awesome.

5 Installing Git Windows: msysgit/ OS X: Appliance: already installed!

6 Installing Git git usage: git [- - version] [- - exec- path[=<path>]] [- - html- path] [- p - - paginate - - no- pager] [- - no- replace- objects] [- - bare] [- - git- dir=<path>] [- - work- tree=<path>] [- c name=value] [- - help] <command> [<args>]

7 git config --global user.name Tommy MacWilliam

8 git config --global user.

9 git init

10 Commits snapshots of your project what your files look like at a given point single event in project history

11 git status

12 git add index.php

13 git add --all

14 git add --all git commit

15 Commit Messages short message describing what s different in this commit add any new features? fix some bugs? break anything?

16 Commit Messages

17 Commit Messages

18 git commit -a -m oh hi, mark!

19 git log

20 5aeebab117b892fa e4c62be676bc4621 b43b0ad1e8108e7ab870d7a54feac93ae8b8600e aa9fa5611ea6dc3912c146a91760

21 Commit 5aeebab117b892fa e4c62be676bc4621 ID b43b0ad1e8108e7ab870d7a54feac93ae8b8600e aa9fa5611ea6dc3912c146a91760 HEAD

22 git show

23 git show b43b0

24 git init git status git add git commit git log git show

25 Branches non-linear development process changes on one branch do not affect other branches crazy idea? make a branch didn t work? delete the branch all done? merge the branch

26 git branch test

27 git branch test git checkout test

28 5aeeb b43b master

29 5aeeb git branch test b43b0 f862f master test

30 git merge

31 5aeeb b43b0 f862f aed git merge master test

32 Like a boss.

33 git branch -D test

34 Merge vs. Rebase git merge: new commit, non-linear history git rebase: no new commit, linear history

35 5aeeb git branch test b43b0 f862f master test

36 5aeeb b43b0 git rebase f862f master

37 Conflicts change in one branch can be incompatible with another git tries to resolve, but sometimes cannot

38 Conflict Resolution int main(int argc, char** argv) { } printf( you invited all my friends ); int main(int argc, char** argv) { } printf( good thinking! );

39 Conflict Resolution int main(int argc, char** argv) { <<<<<<< HEAD:file.c printf( you invited all my friends ); ======= printf( good thinking! ); >>>>>>> f862f:file.c }

40 git checkout git branch git merge git rebase

41 git commit -m oops.

42 git revert b43b0

43 5aeeb b43b

44 5aeeb b43b git revert b43b0 42bb4 (b43b0)

45 File-Specific Reverts git checkout -- index.php replace with version in index git checkout b43b0 index.php replace with version in commit b43b0

46 git reset --hard b43b0

47 git reflog

48 git bisect

49 Like a boss.

50 git revert git reset git checkout git bisect

51 distributed development

52 ssh-keygen

53

54 git push master

55 git remote add origin

56 git remote add origin git push origin master

57 git clone

58 git pull origin master

59 git pull --rebase

60 git init git add - - all git commit Alice Bob

61 git remote add origin url git push origin master Alice Bob

62 git remote add origin url git push origin master Alice Bob

63 git clone url Alice Bob

64 git clone url Alice Bob

65 git add - - all git commit Alice Bob

66 git push origin master Alice Bob

67 git push origin master Alice Bob

68 git pull origin master Alice Bob

69 git pull origin master Alice Bob

70 git branch -a

71 git checkout -b origin/test

72 scp ~/.ssh/id_rsa.pub host:~/.ssh/authorized_keys

73 git init --bare

74 git remote add live

75 git remote add live git push live master

76 Hooks applypatch-msg commit-msg post-commit post-receive post-update post-applypatch pre-commit pre-commit-msg pre-rebase update

77 post-receive #!/bin/sh GIT_WORK_TREE=/home/tmacwill/public_html \ git checkout - f chmod - R 644 /home/tmacwill/public_html/*.html chmod - R 600 /home/tmacwill/public_html/*.php

78 Like a boss.

79 git clone git push git remote git pull

80 More Resources

81 git commit -a -m thanks!