Git-GitHub.ppt for teaching all college stidents

this is git github ppt for students to understand git github for project collabration

1. Workflow
an opinionated discussion
Grad Student, MIMS’14
Shreyas
seekshreyas
some slides adopted from and inspired by Scott Schacon’s https://github.com/schacon/git-
presentations

2. We’ve all been here ...

3. We’ve all been here ...

4. We’ve all been here ...

5. Problems
•multiple versions
•many contributors
•...
conflicts

6. git + Github
a better workflow

7. git
git is an open source,
distributed version control
system designed for speed
and efficiency

8. git
git is an open source,
distributed version control
systemdesigned for speed
and efficiency

9. git
git is an open source,
distributed version control
system designed for speed
and efficiency

10. git
git is an open source,
distributed version control
system designed for speed
and efficiency
(almost) everything is local

11. No Network needed for
(almost) everything is local
•Performing a diff
•Viewing file history
•Committing changes
•Merging branches
•Obtaining any other revision of a file
•Switching branches

12. git
git is an open source,
distributed version control
system designed for speed
and efficiency
http://bit.ly/git-linus-introhttp://bit.ly/git-advantages
More Advantages

13. .. and
•No .svn directories
•Independence

14. installing git
http://git-scm.com/downloads

15. getting setup ...
$ git config --global user.name
“<YOUR_NAME>”
$ git config --global user.email
“<YOUR_EMAIL>”
or edit them in ~/.gitconfig

16. lets dive in..
gitref.org/
•Creating New Repo
•Committing
•Branching/Merging
•InspectionCloning a
RepoUpdating

17. lets dive in..
•Creating New Repo
•Committing
•Branching/Merging
•Inspection
•Cloning a Repo
•Updating
http://git-scm.com/docs

18. Git Commands
$ git init
$ ls -al
$ git init
$ ls -al
$ mkdir workspace
$ cd workspace
Initialized empty Git repository in ../workspace/.git/
drwxr-xr-x 10 Shreyas staff 340 Jan 15 17:22
.git
•Creating New
Repo
•Committing
•Branching/Merging
•Inspection
•Cloning a Repo
•Updating

19. Git Commands
•Creating New
Repo
•Committing
•Branching/Merging
•Inspection
•Cloning a Repo
•Updating
$ cd .git
$ tree -a

20. Git Commands
$ git status
•Creating New
Repo
•Committing
•Branching/Merging
•Inspection
•Cloning a Repo
•Updating
$ cd ..
$ touch testfile.md
branch name
staging area

21. Git Commands
$ git add <filename>
•Creating New
Repo
•Committing
•Branching/Merging
•Inspection
•Cloning a Repo
•Updating
staging area
$ git status

22. Git Commands
$ git commit
•Creating New
Repo
•Committing
•Branching/Merging
•Inspection
•Cloning a Repo
•Updating
your commit msg
$ git status

23. Git Commands
$ git reset
•Creating New
Repo
•Committing
•Branching/Merging
•Inspection
•Cloning a Repo
•Updating
(undo add)
changes staged
changes unstaged

24. Git Commands
$ git reset --soft HEAD^
•Creating New
Repo
•Committing
•Branching/Merging
•Updating
•Inspection
•Cloning A Repo
(undo a commit and
redo)
$ git reset --hard
HEAD~3 Rewind the branch to get rid of last three commits
http://git-scm.com/docs/git-
reset
http://git-scm.com/docs/git-
revert.html
learn more here :
also refer
git revert :
http://git-scm.com/docs/git-stashgit stash :

25. Git Commands
$ git rm <filename>
•Creating New
Repo
•Committing
•Branching/Merging
•Inspection
•Cloning a Repo
•Updating
remove a file from the
repo
as expected, you will need to commit the
change
$ git mv <filename>
move/rename a file from the repo
as expected, you will need to commit the
change

26. Git Commands
$ git branch
•Creating New
Repo
•Committing
•Branching/Merging
•Inspection
•Cloning a Repo
•Updating
list of branches
$ git branch <branchname> new branch
$ git checkout
<branchname>
switch

27. Git Commands
•Creating New
Repo
•Committing
•Branching/Merging
•Inspection
•Cloning a Repo
•Updating
new branch
dev
switch branch
branch list

28. Git Commands
•Creating New
Repo
•Committing
•Branching/Merging
•Inspection
•Cloning a Repo
•Updating
$ git merge <branchname>
merge
branches
branch merge

29. Git Commands
•Creating New
Repo
•Committing
•Branching/Merging
•Inspection
•Cloning a Repo
•Updating
$ git log
--graph
--decorate
--abbrev-commit
--all
--pretty=oneline
text-based graph :)

30. Git Commands
•Creating New
Repo
•Committing
•Branching/Merging
•Inspection
•Cloning a Repo
•Updating
~/.gitconfig
[alias]
l = log --pretty=oneline -n 20 --graph

31. Git Commands
•Creating New
Repo
•Committing
•Branching/Merging
•Inspection
•Cloning a Repo
•Updating
$ gitk

32. Working with others...
•Creating New
Repo
•Committing
•Branching/Merging
•Inspection
•Cloning a Repo
•Updating
github

33. GitHub
•Creating New
Repo
•Committing
•Branching/Merging
•Inspection
•Cloning a Repo
•Updating
create an account
www.github.com/edu

34. GitHub
•Creating New
Repo
•Committing
•Branching/Merging
•Inspection
•Cloning a Repo
•Updating
add ssh key
www.github.com/edu

35. GitHub
•Creating New
Repo
•Committing
•Branching/Merging
•Inspection
•Cloning a Repo
•Updating
$ git clone <url> <name>
https://github.com/jblomo/datamining2
90

36. GitHub
•Creating New
Repo
•Committing
•Branching/Merging
•Inspection
•Cloning a Repo
•Updating
Fork a repo

37. GitHub
•Creating New
Repo
•Committing
•Branching/Merging
•Inspection
•Cloning a Repo
•Updating
$ git pull
$ git push
= git fetch + git merge

38. GitHub
•Creating New
Repo
•Committing
•Branching/Merging
•Inspection
•Cloning a Repo
•Updating
GitHub Pull Request

39. GitHub Ninja Features
Markdown
for documentation
Pages
for project hosting
Gist
for project hosting
Service Hooks
‘do something’on commit

40. may the Force be with
you