![Git Commands
ā¢ Creating New
Repo
ā¢ Committing
ā¢ Branching/
Merging
ā¢ Inspection
ā¢ Cloning a Repo
ā¢ Updating
~/.gitconfig
[alias]
l = log --pretty=oneline -n 20 --
graph](https://image.slidesharecdn.com/git-github-240819130053-cc5161e5/85/Distributed-Version-control-using-Git-and-Github-30-320.jpg)
Distributed Version control using Git and Github
- 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 system designed 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-intro ttp://bit.ly/git-advantages More Advantages
- 13. .. and ā¢ No .svn directories ā¢ Independence
- 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-r eset http://git-scm.com/docs/git-rev ert.html learn more here : also refer git revert : http://git-scm.com/docs/git-sta sh git 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/ datamining290
- 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
Editor's Notes
- #2: we start off a project having a fair idea of what we are going to do ...
- #3: soon we have multiple iterations, multiple versions...
- #4: and then we have to collaborate, share...
- #11: (almost) everything is local... branching, merging etc
- #12: (almost) everything is local... branching, merging etc
- #13: initially created by Linus Torvalds, now supported by a huge open source community ... field tested with Linux Kernel
- #14: You donāt have to go ask someone to create a branch for you, or create a repo for you or request a branch merge.. you do as you please with YOUR copy.
- #15: Weāll be using the git command line interface, but feel free to choose your preferred solution GUIs, Editor Extension etc
- #23: Although, I like working in small steps, here are some shortcuts git commit -m ā<your msg>ā [doesnāt open up the editor for msg] git commit -am ā<your msg>ā [adds the files tracked and uses msg on command-line]
- #36: now do a demo of jim workflow
- #37: now show them a demo of creating ssh key on my ischool account
- #39: show the students
- #40: show the students