1. git
the fast version control system

2. pull pull
push push
pull pull
pull pull
push

3. getting and creating
projects

4. config
configuring your git environment

5. $ git config --global user.name “Your Name”
$ git config --global user.email “name@domain.com”

6. $ git config --global alias.st status
$ git config --global alias.ci commit
$ git config --global alias.co checkout
$ git config --global alias.br branch

7. $ git config --global color.ui auto

8. $ git config --global apply.whitespace nowarn

9. $ git config --global core.editor “mate -w”

10. ~/.gitconfig

11. init
initializes a directory as a git repository

15. .
|-- COMMIT_EDITMSG
|-- FETCH_HEAD
|-- HEAD
|-- ORIG_HEAD
|-- branches
|-- config
|-- description
|-- hooks
| |-- applypatch-msg
| |-- commit-msg
| |-- post-commit
| |-- post-receive
| |-- post-update
| |-- pre-applypatch
| |-- pre-commit
| |-- pre-rebase
| |-- prepare-commit-msg
| `-- update
|-- index
|-- info
| `-- exclude
|-- logs
| |-- HEAD
| `-- refs
|-- objects
`-- refs
|-- heads
|-- remotes
|-- stash
`-- tags

16. clone
copy a git repository

19. basic snapshotting

20. add
adds file contents to the staging area

25. status
view the status of your files in the working directory and staging area

28. diff
shows diff of what is staged and what is modified but unstaged

31. commit
records a snapshot of the staging area

34. $ git commit -m ‘Fix commit msg’ --amend

35. reset

37. $ git reset --hard

38. $ git clean -df
clean.requireForce defaults to true

39. rm
remove files from the staging area

42. mv
rename files in the staging area

45. stash
saving temporarily local changes

48. branching and merging

49. branch
list, create and manage working contexts

53. alias “ co “

55. checkout

56. $ git checkout <branch>
$ git checkout <tag>
$ git checkout <commit>
$ git checkout <file>

57. merge
merge a branch context into your current branch

63. log
show commit history of a branch

71. tag
tag a point in history as important

76. sharing and updating
projects

77. remote
list, add and delete remote repository aliases

80. fetch, pull

81. Download objects and refs from another repository
$ git fetch <repo>
$ git fetch --all

82. $ git pull <repo> <branch>

83. push

84. $ git push <repo> <branch>

85. $ git push <repo> :<branch>

86. patch

87. $ git format-patch master --stdout > fix_bug.patch

89. $ git diff HEAD~1 > fix_bug.patch
$ git apply fix_bug.patch

90. rebase

91. merge vs rebase

92. merge rebase

93. reordering commits

94. $ git rebase -i HEAD~3

96. $ git pull --rebase

97. $ git config branch.master.rebase true
$ git config branch.branch3.rebase true
$ git config branch.autosetuprebase always
$ git pull --no-rebase

100. $ git rebase --continue
$ git rebase --abort

101. inspection and
comparison

102. log

107. $ git rev-list

108. diff

116. git
the fast version control system
• http://git-scm.com/
• http://gitready.com/
• http://gitref.org/
• http://github.com/
• http://bitbucket.org/
• http://progit.org/
• http://stackoverflow.com/
• http://www.arthurkoziel.com/2008/05/02/git-configuration/
• http://www.iconfinder.com/