Introduction to git - sessions that was run across MLCL technology team.

1. A Distributed Version Control System

2. goals
• svn vs git
• typical git workflow
• logs
• branching, merging & tagging
• undoing
• next steps

3. svn vs git

4. svn

5. git

6. local repository

7. fast

8. shareable

9. safer

10. git command line

11. git --help

12. start a working area (see also: git help tutorial)
clone Clone a repository into a new directory
init Create an empty Git repository or reinitialize an existing one
work on the current change (see also: git help everyday)
add Add file contents to the index
mv Move or rename a file, a directory, or a symlink
reset Reset current HEAD to the specified state
rm Remove files from the working tree and from the index
examine the history and state (see also: git help revisions)
bisect Use binary search to find the commit that introduced a bug
grep Print lines matching a pattern
log Show commit logs
show Show various types of objects
status Show the working tree status
grow, mark and tweak your common history
branch List, create, or delete branches
checkout Switch branches or restore working tree files
commit Record changes to the repository
diff Show changes between commits, commit and working tree, etc
merge Join two or more development histories together
rebase Reapply commits on top of another base tip
tag Create, list, delete or verify a tag object signed with GPG
collaborate (see also: git help workflows)
fetch Download objects and refs from another repository
pull Fetch from and integrate with another repository or a local branch
push Update remote refs along with associated objects

13. git clone

14. git clone https://github.com/h5bp/html5-boilerplate.git

15. git clone git@github.com:h5bp/html5-boilerplate.git

16. .git/

17. .git/config

18. .git/refs

19. .git/HEAD

20. the git workflow

22. git status

23. git diff

24. git add

25. git commit -m ‘Message’
this is very different from svn’s commit

26. git push origin master

27. git pull/fetch

28. walkthrough

29. new repository

30. git init

31. git remote add origin <repo>

32. git remote -v

33. git push origin master

34. git push <name> <branch>

35. walkthrough

37. logs

38. git log

39. commit 35caa01bfa4cbff15d06382021e2028bdf0a77ad
Author: Aryeh Weinreb <aryehweinreb@gmail.com>
Date: Wed May 10 01:59:20 2017 +0300
Add options to host.autostart.add (#719)
commit 2030458d4e8ea0bbf0363ea109d0f3004686e802
Author: Doug MacEachern <dougm@vmware.com>
Date: Thu May 4 15:31:55 2017 -0700
Add VC options command (#717)
Refactor host.options commands so they support vCenter
commit 0ccad10c7a0af6ec3920e164ebca957ac4535729
Author: aniketGslab <aniket.shinde@gslab.com>
Date: Thu May 4 20:41:00 2017 +0530
Exported FindSnapshot() Method (#715)

40. commit 35caa01bfa4cbff15d06382021e2028bdf0a77ad
Author: Aryeh Weinreb <aryehweinreb@gmail.com>
Date: Wed May 10 01:59:20 2017 +0300
Add options to host.autostart.add (#719)
commit 2030458d4e8ea0bbf0363ea109d0f3004686e802
Author: Doug MacEachern <dougm@vmware.com>
Date: Thu May 4 15:31:55 2017 -0700
Add VC options command (#717)
Refactor host.options commands so they support vCenter
commit 0ccad10c7a0af6ec3920e164ebca957ac4535729
Author: aniketGslab <aniket.shinde@gslab.com>
Date: Thu May 4 20:41:00 2017 +0530
Exported FindSnapshot() Method (#715)

41. commit 35caa01bfa4cbff15d06382021e2028bdf0a77ad
Author: Aryeh Weinreb <aryehweinreb@gmail.com>
Date: Wed May 10 01:59:20 2017 +0300
Add options to host.autostart.add (#719)
commit 2030458d4e8ea0bbf0363ea109d0f3004686e802
Author: Doug MacEachern <dougm@vmware.com>
Date: Thu May 4 15:31:55 2017 -0700
Add VC options command (#717)
Refactor host.options commands so they support vCenter
commit 0ccad10c7a0af6ec3920e164ebca957ac4535729
Author: aniketGslab <aniket.shinde@gslab.com>
Date: Thu May 4 20:41:00 2017 +0530
Exported FindSnapshot() Method (#715)

42. git log -1

43. git log -2

44. git log -10

45. git log --oneline

46. 35caa01 Add options to host.autostart.add (#719)
2030458 Add VC options command (#717)
0ccad10 Exported FindSnapshot() Method (#715)

47. git log --oneline --graph

48. * 35caa01 Add options to host.autostart.add (#719)
* 2030458 Add VC options command (#717)
* 0ccad10 Exported FindSnapshot() Method (#715)
* b8b228c Merge pull request #714 from BaluDontu/
|
| * 34202ac Additional wrapper functions for SPBM
|/
* 35ddbd4 Merge pull request #713 from dougm/methods
|
| * c7f718b Add AuthorizationManager {Enable,Disable}Methods
|/
* 5072cda Merge pull request #711 from dougm/pbm

49. git log --stat

50. git log --author="Who"

51. git log --grep="what"

52. git log --no-merges

53. git log --merges

54. walkthrough

55. ignoring things

56. .gitignore

57. sample/
.cache
venv
docs/build/
.idea
*.py?
__pycache__/
.coverage
chalice.egg-info/

58. branching

59. git branch

60. git branch <name>

61. git checkout <name>

62. git checkout -b <name>

63. git merge <target-branch>

64. git rebase <target-branch>

65. tagging

66. git tag <tagname>

67. git tag -a v1.1 -m ‘Description’

68. mistakes happen

69. git reset HEAD <file>

70. git checkout -- <file>

71. git reset --hard <SHA>

72. git reset --hard
CAUTION - this reset is global!

73. walkthrough

74. next steps…

75. https://try.github.io/

76. • Stashing
• Submodules
• Subtree
• Multiple Remotes
useful topics
• Interactive Staging
• Amends
• Git Hooks
• Sharing with git daemon

77. bitbucket

78. pull requests

79. ui client

80. git UI client

82. questions?
wee.keat.chin@mlcinsurance.com.au