11 git version control
Download as PPTX, PDF0 likes51 views
This document provides an overview of important Git commands and concepts: - It lists common Git commands like commit, diff, branch, merge, log and config along with explanations of staging areas and repositories. - Key concepts discussed include commits, blobs, branches and how to start a new Git repository or clone an existing one from services like GitHub. - Guidance is provided on branching, merging, ignoring files and viewing commit histories.
![Cloning/forking
Git clone [https link]
Git log: list latest commits ( q to skip/quit)
Git log stat (show updated files)
git checkout <commit hash> (to return to specific commit)
Demo: fork a repository >update > push > pull
Cd ..
rm -rf [Directory]
Git clone [directory]
git remote v
Show attached connections to current repository](https://image.slidesharecdn.com/phv2fpj9ssgbyxfa9drg-signature-5f7983e49dffd04cff9d235eb59329c0bf475886d810e4cc207676f455f13d4d-poli-190424113733/85/11-git-version-control-14-320.jpg)
![Creating git repository
Mkdir [directory name]
Git init
Git status (shows changed files since last commit)
https://choosealicense.com/
Vim LICENSE
Escape then :wq to save file changes
Vim README.md
# headline](https://image.slidesharecdn.com/phv2fpj9ssgbyxfa9drg-signature-5f7983e49dffd04cff9d235eb59329c0bf475886d810e4cc207676f455f13d4d-poli-190424113733/85/11-git-version-control-15-320.jpg)
![vim
Vim filename -> create file and edit it using vim
Rm [filename] -> remove a file](https://image.slidesharecdn.com/phv2fpj9ssgbyxfa9drg-signature-5f7983e49dffd04cff9d235eb59329c0bf475886d810e4cc207676f455f13d4d-poli-190424113733/85/11-git-version-control-16-320.jpg)
![Do changes to file
Git diff
Git add
Git diff ( no Is empty)
Then you have to use git log p to see the diff
Git diff staged (to get the diff between staged and repository)
Git reset HEAD [filename] ( to remove a file from staging area)
Git diff [commit hash] [commit hash]
Git show [commit hash]](https://image.slidesharecdn.com/phv2fpj9ssgbyxfa9drg-signature-5f7983e49dffd04cff9d235eb59329c0bf475886d810e4cc207676f455f13d4d-poli-190424113733/85/11-git-version-control-17-320.jpg)
![Global ignore files
https://github.com/github/gitignore
git config --global core.excludesfile (see where its stored)
Vim [directory/filename]](https://image.slidesharecdn.com/phv2fpj9ssgbyxfa9drg-signature-5f7983e49dffd04cff9d235eb59329c0bf475886d810e4cc207676f455f13d4d-poli-190424113733/85/11-git-version-control-20-320.jpg)
![Viewing history
Git log
Git log -4
Git log oneline
Git log graph
Git log oneline graph all
Git shortlog (seperated by auther)
Git log author=wasim ( filter by auther name)
Git log grep=idea ( filter by keyword in commit messages)
Git log [filename] ( get all commits related to filename)](https://image.slidesharecdn.com/phv2fpj9ssgbyxfa9drg-signature-5f7983e49dffd04cff9d235eb59329c0bf475886d810e4cc207676f455f13d4d-poli-190424113733/85/11-git-version-control-21-320.jpg)
![git branch [mybranch] ( create a branch)
Git branch ( view branches )
git checkout [mybranch] ( switch to other branch)
git branch -d [mybranch] (delete a branch)
* is the current branch](https://image.slidesharecdn.com/phv2fpj9ssgbyxfa9drg-signature-5f7983e49dffd04cff9d235eb59329c0bf475886d810e4cc207676f455f13d4d-poli-190424113733/85/11-git-version-control-23-320.jpg)
![Merging
Git referance for 3 points, last 2 commits in both branchs and the
commit they splited from. And calc the diff then merge the diff.
Git merge [mybranch] ( merge mybranch to current branch)
Git merge no-ff [mybranch] (to prevent fast forward merge)](https://image.slidesharecdn.com/phv2fpj9ssgbyxfa9drg-signature-5f7983e49dffd04cff9d235eb59329c0bf475886d810e4cc207676f455f13d4d-poli-190424113733/85/11-git-version-control-24-320.jpg)
More Related Content
What's hot (20)
Similar to 11 git version control (20)
More from Wasim Alatrash (12)
Recently uploaded (10)
11 git version control
- 2. Important commands cd <directory> cd ~ cd .. pwd # print working directory ls # list the files in this directory diff -u test.txt test2.txt ( fc in windows)
- 3. Primitive source control You create new copy each time Version source control Keep track of code history
- 4. Who uses version control ? Google docs Wekipedia Dropbox Git Subversion (SVN)
- 6. When to commit? By function
- 7. Lets use dropbox, it automates the process noob.. !
- 8. Key concepts Commit Blob diff Branch Merge Repository
- 10. Config username and email git config --global user.email "w-elatrash@hotmail.com" git config --global user.name Wasim Alatrash"
- 11. Two ways to start working with git You have a project on your local machine You want to clone a project from repository
- 12. Github GitLab bitbucket
- 13. Remote Cloning Clone Demo: Clone a project
- 14. Cloning/forking Git clone [https link] Git log: list latest commits ( q to skip/quit) Git log stat (show updated files) git checkout <commit hash> (to return to specific commit) Demo: fork a repository >update > push > pull Cd .. rm -rf [Directory] Git clone [directory] git remote v Show attached connections to current repository
- 15. Creating git repository Mkdir [directory name] Git init Git status (shows changed files since last commit) https://choosealicense.com/ Vim LICENSE Escape then :wq to save file changes Vim README.md # headline
- 16. vim Vim filename -> create file and edit it using vim Rm [filename] -> remove a file
- 17. Do changes to file Git diff Git add Git diff ( no Is empty) Then you have to use git log p to see the diff Git diff staged (to get the diff between staged and repository) Git reset HEAD [filename] ( to remove a file from staging area) Git diff [commit hash] [commit hash] Git show [commit hash]
- 18. Staging area Working directory Staging area (index) Repository Git add to add to staging area git reset HEAD <file> To remove from staging area
- 19. Ignore Files Passwords and secret files Build files Third party libraries that you can reinstall it using library manager Demo Vim .gitignore *.html /dir1 Filename.txt
- 20. Global ignore files https://github.com/github/gitignore git config --global core.excludesfile (see where its stored) Vim [directory/filename]
- 21. Viewing history Git log Git log -4 Git log oneline Git log graph Git log oneline graph all Git shortlog (seperated by auther) Git log author=wasim ( filter by auther name) Git log grep=idea ( filter by keyword in commit messages) Git log [filename] ( get all commits related to filename)
- 22. Branching By default: it creates master branch What is the branch ? Label for particular commit, and it keep moving while you are commiting Commit hash help commits refer to its parent When to Use Branches?
- 23. git branch [mybranch] ( create a branch) Git branch ( view branches ) git checkout [mybranch] ( switch to other branch) git branch -d [mybranch] (delete a branch) * is the current branch
- 24. Merging Git referance for 3 points, last 2 commits in both branchs and the commit they splited from. And calc the diff then merge the diff. Git merge [mybranch] ( merge mybranch to current branch) Git merge no-ff [mybranch] (to prevent fast forward merge)
- 25. There are no staging area in github Only related commits will be pushed to github Create a Repository Init the rep with readme will create one commit, dont do that if you already have git project stored locally and you want to push it Git remote Git remote v Git remote add <name> // usually called origin
- 26. Git pull <remote> <branch-name> Why might you want to always pull changes manually rather than having Git automatically stay up-to-date with your remote repository? Forking It make it easy to share you project with otherone without pulling the code > push to new repository > then let the other developer do pull again from the new remote Fork is not git command, its github innovation
- 27. Git clone Git clone add remote for you automatically Add contributors from settings Get fetch origin master Get merge master origin/master
Editor's Notes
- #8: - Manual vs auto Commits: you should use manual to make logically right commits when you finish feature or complete update - Dropbox dont save history forever, its available for 1 month, then it will be removed!
- #15: Git log: list latest commits rm -rf [Directory]油means油force the recursive removal of someDirectory
- #16: 悖 惆惘惠惘 惡惠惆惘 惠忰 惠 惡惘悴惠.. 悋 惡惶惘 悋 悋惠 惡惠惷 惆惘 悽 悋愕 惆惠 惠 悴悋惠 悋惆惘
- #17: The Vim editor is a modal editor. That means that the editor behaves differently, depending on which mode you are in. The two basic modes are called Normal mode and Insert mode. In Normal mode the characters you type are commands. In Insert mode the characters are inserted as text.
- #18: git diff 惡悴惡 悋惘 惡 悋愕惠悴 悋惘悋 悋惘 惆惘惠惘.. 悋悋 惷悋 悋悋惠 悋 悋惠惺惆惠 惺 悋愕惠悴 悋惘悋 .. 悋 悖 悋悽惠悋悋惠
- #19: 悋 惡惺 add 悋悋 惡惷 悋悋惠 惺 悋愕惠悴 悋惘悋 惡惺惆悋 惡惘忰 惡惺 惠 惡惠惠 悋愕惠悴 惘惡慍惠惘.. 惠悽 惺 惠 惺悋 惺惆悸 惠惺惆悋惠 惡惆 惠惷 惠惺惆 惠 忰惆.. 惡惠惺 悋惆 悋惠 悋 悋悋 惺悋悸 惡惺惆 惠 惓 愕 悋惘悸 惠惺惆 悋惠悋..