Version Control with Git For Beginners

1. Version Control
With

2. /Khorshed.RS
MD. KHORSHED
ALAM
CEO & Founder
/in/Khorshedrs
/Khorshed.RS

3. Everyday Workflow
Create a file
Save it
Edit it
Save it again
Etc …..

4. Everyday Workflow

5. Everyday Workflow

6. Can we automate this?
When
What
Why
Who
For each document version, we need to know

7. Story of Git
"I'm an egotistical bastard, so I name all my
projects after myself. First Linux, now Git”
Linus Torvalds, PC World. 2012-07-14

8. Story of Git
Linus needed a new source code revision
manager for
Linux, and none of the available options in 2005
where
good enough, so he wrote his own in.
Kernel 2.6.12 was the first release managed by Git
and

9. What Is Git ?
Distributed Version
Control System
Directory
Tree History
Storage System
Stupid Content
Tracker

10. Whatever You Think About It ….
uper Cool

11. Distributed
1
Everyone has the
complete history
3
2
4
Everything is done
offlineExcept Push / Pull
No central authority
Except by convention
Changes can be
shared without a
server

12. Git popularity according to OpenHub.net
CVS
10%
GIT
38%
MERCURI
AL
2%
SUBVERSIO
N
48%

13. Git might feel difficult at first,
but once you learn it, you
never
want to go back to anything
less

14. Installing GIT
https://git-scm.com

15. First Time Setup
Check Version
$ git --version
Setup User
$ git config --global user.name “rssoftware”
$ git config --global user.email
”git@thersoftware.com”
$ git config --list

16. Init
$ cd project
$ git init

17. Status
$ git status

18. .gitignore
$ touch .gitignore

19. Add
$ git add <file>
or
$ git add .

20. Reset
$ git reset <file>
or
$ git reset .

21. Commit
$ git commit –m "detailed message"

22. Log
$ git log

23. Show
$ git show
or
$ git show <hash_id>

24. Diff
Working :
$ git diff
$ git diff <file>
Staging :
$ git diff --cached
$ git diff –-cached <file>

25. Branching
$git branch my-feature
One feature = One branch

26. Working in the Branch
$git checkout my-feature
$git commit (x2)

27. Merge
$git checkout master
$git diff master..my-feature
$git merge my-feature

28. Clean Up
$git branch -d my-feature

29. Thank you for your attention