Git
0 likes309 views
The document provides an overview of using Git for version control and collaboration. It covers Git basics like setting up a repository, tracking and committing files, branching and merging, and collaborating using remotes on services like GitHub. The typical workflow involves creating a local Git repository, making commits on branches, merging branches together, and pushing/pulling changes to/from a shared remote repository.
![tracking files / staging files
git add [filename]
git add [filename1] [filename2] [filename3]
git add . or git add *
untracked staged
modified staged](https://image.slidesharecdn.com/git-160119134025/85/Git-24-320.jpg)
![git work flow
create / delete / modify files
stage files
commit changes
[repeat]
git commit –am “commit message”](https://image.slidesharecdn.com/git-160119134025/85/Git-26-320.jpg)
![removing files
git rm [filename]
git rm [filename1] [filename2] [filename3]
removes the file from the staging area
and the working directory](https://image.slidesharecdn.com/git-160119134025/85/Git-27-320.jpg)
![untracking files
git rm --cached [filename]
staged untracked](https://image.slidesharecdn.com/git-160119134025/85/Git-28-320.jpg)
![undoing things
git checkout -- [filename]
discarding changes
modified unmodified
git reset HEAD [filename]
unstaging files
git reset HEAD
staged modified](https://image.slidesharecdn.com/git-160119134025/85/Git-29-320.jpg)
![viewing changes
git diff
unstaged changes
git show [commit hash]
changes done in a commit
git diff --cached
staged changes](https://image.slidesharecdn.com/git-160119134025/85/Git-31-320.jpg)
![creating a branch
git branch [branch name] git checkout [branch-name]
switch to the new branch
timeline
HEAD
[branch name]
master timeline
HEAD
[branch name]
master
git checkout –b [branch name]](https://image.slidesharecdn.com/git-160119134025/85/Git-35-320.jpg)
![merging branches
git checkout [branch to merge into]
switch to the branch you want to merge into
git merge [branch to merge from]
perform merge](https://image.slidesharecdn.com/git-160119134025/85/Git-37-320.jpg)
![deleting a branch
git checkout [some other branch]
switch to a branch other than the
one to be deleted
git branch –d [branch name]
delete branch](https://image.slidesharecdn.com/git-160119134025/85/Git-38-320.jpg)
![managing remotes
git remote add [remote name] [remote URL]
creating a new remote
git remote rm [remote name]
deleting a remote](https://image.slidesharecdn.com/git-160119134025/85/Git-43-320.jpg)
![data transfer to/from a remote
git push [remote name] [remote branch name]
sending data to a remote
git pull [remote name] [remote branch name]
getting data from a remote](https://image.slidesharecdn.com/git-160119134025/85/Git-44-320.jpg)
Ad
More Related Content
What's hot (16)
Similar to Git (20)
Ad
More from Omar Al-Sabek (17)
Ad
Recently uploaded (20)
Git
- 10. without git feature 1 feature 2 feature 3 feature 4 feature 5 final
- 11. project-v1 project without git project-v2 project-v3 project-final
- 12. without git ?
- 15. setting up git
- 16. the basics
- 17. Typical workflow Person A • Setup project • push code onto github • edit/commit • edit/commit • pull/push Person B • clone code from github • edit/commit/push • edit… • edit… commit • pull/push
- 19. parts of a git repository working directory staging area (index) git directory (HEAD) stage commit checkout
- 22. getting a git repository git init create one git clone /path/to/repository copy an existing repository timeline HEADmaster timeline HEADmaster
- 23. checking project status git status file status untracked unmodified modified staged
- 24. tracking files / staging files git add [filename] git add [filename1] [filename2] [filename3] git add . or git add * untracked staged modified staged
- 25. committing changes git commit git commit –m “commit message” staged unmodified timeline HEADmaster
- 26. git work flow create / delete / modify files stage files commit changes [repeat] git commit –am “commit message”
- 27. removing files git rm [filename] git rm [filename1] [filename2] [filename3] removes the file from the staging area and the working directory
- 28. untracking files git rm --cached [filename] staged untracked
- 29. undoing things git checkout -- [filename] discarding changes modified unmodified git reset HEAD [filename] unstaging files git reset HEAD staged modified
- 30. undoing things git commit --amend changing the last commit git reset --soft HEAD undoing the last commit unmodified staged git reset --hard HEAD discard all changes in last commit
- 31. viewing changes git diff unstaged changes git show [commit hash] changes done in a commit git diff --cached staged changes
- 32. viewing commit history git log git log --oneline git log --graph git log --since=“2013-12-01” git log --author=“Lorem Ipsum” git log --until=“2013-12-01”
- 33. branching
- 35. creating a branch git branch [branch name] git checkout [branch-name] switch to the new branch timeline HEAD [branch name] master timeline HEAD [branch name] master git checkout –b [branch name]
- 36. committing to branches timeline master HEAD feature git commit –m “commit message”
- 37. merging branches git checkout [branch to merge into] switch to the branch you want to merge into git merge [branch to merge from] perform merge
- 38. deleting a branch git checkout [some other branch] switch to a branch other than the one to be deleted git branch –d [branch name] delete branch
- 39. collaboration
- 40. setting up for Github sign up for a Github account generate SSH key (if your machine currently doesn’t have one) add your SSH key to your Github account
- 41. two repositories local repository - working directory - staging area - git directory remote repository - git directory
- 42. remotes git remote showing all remotes git remote -v include remote URL
- 43. managing remotes git remote add [remote name] [remote URL] creating a new remote git remote rm [remote name] deleting a remote
- 44. data transfer to/from a remote git push [remote name] [remote branch name] sending data to a remote git pull [remote name] [remote branch name] getting data from a remote
- 45. collaboration