Introduction to git
0 likes1,229 views
The document provides an introduction to Git, detailing its features such as backup, recovery, and team collaboration. It includes instructions on how to configure Git, initialize repositories, track files, commit changes, and manage file statuses. Additionally, it covers how to view changes and commit history using various Git commands.
![git configuration
Current repository configs
git action [arguments]
Current user global configs
git config --global user.name aasiutin
git config --global user.email sutok85@gmail.com
view all git configuration variables
git config --list](https://image.slidesharecdn.com/l-01-slides-130903092331-/85/Introduction-to-git-23-320.jpg)
![git commands structure
general command structure
git action [arguments]
getting help
git help
git help <action>](https://image.slidesharecdn.com/l-01-slides-130903092331-/85/Introduction-to-git-24-320.jpg)
![git add use cases
git add file1 file2 [file3 ...] #add list of
files
git add *.txt #add all txt files in current
directory
git add docs/*.txt #add all txt files in docs
directory
git add docs/ #add all files in docs directory
git add "*.txt" #add all txt files in the whole
project
git add --all #add all files](https://image.slidesharecdn.com/l-01-slides-130903092331-/85/Introduction-to-git-31-320.jpg)
![Commit changes to git
$ git commit
# Please enter the commit message for your changes. Lines
starting
# with '#' will be ignored, and an empty message aborts the
commit.
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: README
~
~
~
".git/COMMIT_EDITMSG" 10L, 283C
$ git config --global core.editor [editor]
$ git commit -a -m “Commit message goes here”](https://image.slidesharecdn.com/l-01-slides-130903092331-/85/Introduction-to-git-33-320.jpg)
![Commit changes to git (2)
$ git commit -m "Message goes here"
[master]: created 463dc4f: "Message goes here"
2 files changed, 3 insertions(+), 0 deletions(-
)
create mode 100644 README](https://image.slidesharecdn.com/l-01-slides-130903092331-/85/Introduction-to-git-34-320.jpg)
![Deleting and moving files
$ git rm [filename]
rm “[filename]”
$ git rm -f [filename] #remove changed file
$ git rm --cached [filename] #remove only from
git, but not from filesystem
$ git mv old-name new-name #rename/move file
$ mv old-name new-name
$ git rm oldname
$ git add new-name](https://image.slidesharecdn.com/l-01-slides-130903092331-/85/Introduction-to-git-36-320.jpg)
![Undo changes
$ git commit --amend #modify last commit
$ git reset HEAD [filename] #unstage file, keep
changes
$ git checkout HEAD -- [filename] #discard all
file changes and return last commit file state](https://image.slidesharecdn.com/l-01-slides-130903092331-/85/Introduction-to-git-37-320.jpg)
Introduction to git
- 1. Code management problems and VCS review. Introduction to git. Aleksey Asiutin
- 2. Old good version control system
- 3. Working on the website index.htm
- 5. “Our team” HTML page
- 6. Austin Powers came into the play
- 7. File changes
- 9. File changes
- 10. Dr. Evil is bad
- 11. Dr. Evil is good
- 12. Merge problem
- 15. VCS Features ● Backup and Recovery ● Team Collaboration and Synchronization ● History Log ● Nonlinear Project Flow ● Find a Guy to Blame :)
- 17. Centralized VCS
- 18. Distributed VCS
- 20. Classic VCS working scheme
- 21. How git works with files
- 23. git configuration Current repository configs git action [arguments] Current user global configs git config --global user.name aasiutin git config --global user.email sutok85@gmail.com view all git configuration variables git config --list
- 24. git commands structure general command structure git action [arguments] getting help git help git help <action>
- 25. Initialize git repository git init Initialized empty Git repository in /Users/spu/mygithub/.git/
- 26. Clone remote git repository git clone https://github.com/aasiutin/twitter- api-php.git cloning into 'twitter-api-php'... remote: Counting objects: 24, done. remote: Compressing objects: 100% (16/16), done. remote: Total 24 (delta 3), reused 21 (delta 2) Unpacking objects: 100% (24/24), done.
- 28. Check git status git status # On branch master nothing to commit (working directory clean)
- 29. Add README, check git status git status # On branch master # Untracked files: # (use "git add <file>..." to include in what will be committed) # # README nothing added to commit but untracked files present (use "git add" to track)
- 30. Start tracking files git add README $ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # new file: README
- 31. git add use cases git add file1 file2 [file3 ...] #add list of files git add *.txt #add all txt files in current directory git add docs/*.txt #add all txt files in docs directory git add docs/ #add all files in docs directory git add "*.txt" #add all txt files in the whole project git add --all #add all files
- 32. modify tracked files $ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # new file: README # # Changed but not updated: # (use "git add <file>..." to update what will be committed) # # modified: README
- 33. Commit changes to git $ git commit # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: README ~ ~ ~ ".git/COMMIT_EDITMSG" 10L, 283C $ git config --global core.editor [editor] $ git commit -a -m “Commit message goes here”
- 34. Commit changes to git (2) $ git commit -m "Message goes here" [master]: created 463dc4f: "Message goes here" 2 files changed, 3 insertions(+), 0 deletions(- ) create mode 100644 README
- 36. Deleting and moving files $ git rm [filename] rm “[filename]” $ git rm -f [filename] #remove changed file $ git rm --cached [filename] #remove only from git, but not from filesystem $ git mv old-name new-name #rename/move file $ mv old-name new-name $ git rm oldname $ git add new-name
- 37. Undo changes $ git commit --amend #modify last commit $ git reset HEAD [filename] #unstage file, keep changes $ git checkout HEAD -- [filename] #discard all file changes and return last commit file state
- 38. Ignoring files $ cat .gitignore # a comment - this is ignored *.a # no .a files !lib.a # but do track lib.a, even though # you're ignoring .a files above /TODO # only ignore the root TODO file, not # subdir/TODO build/ # ignore all files in the build/ # directory doc/*.txt # ignore doc/notes.txt, but not # doc/server/arch.txt
- 39. View changes and commit history $ git diff #view unstaged changes $ git diff --staged #view staged changes $ git log #view commit history -p --stat --graph --pretty=oneline|short|full|fuller|format --since --untill --before --after $ git log --pretty=format:”%h - %an” --before=”2 days ago” --after=”2013-04-25”