GIT Flashcards
Git
A Version Control System for tracking changes in files and coordinating work on them in team
Creating a repository
Git init
Check for changes
Git status
When there aren’t any files with changes in working directory then the directory is …..
Clean
Add a file to list of tracked files
Git add
When we add a file to list of tracked files using git add we’re said to stage it
When content is changed
The file is tracked but not staged anymore
Need to stage the file again using git add
Add all the un-staged files in the current directory (and deeper)
Git add .
When we run git add
Git captures a snapshot of the changes that we can make permanent by committing them to the repository
Committing changes to repository
Git commit -m “message”
Workflow
Make changes in the working directory
Use git add to stage them
Use git commit to save changes to repository
Check if git is installed
Open terminal
Git –version
Repository
Special type of directory that keeps track of the files within it
Git status
Tells if the working directory is clean
Tells what files are staged and ready to be committed
Tells what files are tracked but not staged
Tells what files are untracked
Git log
Git keeps track of every commit that we make
We can easily review them using git log
Brings up the commit history, where every commit is displayed with unique hash code
Git log
Pointer that point to the current commit
Git show HEAD
Go back to previous commit and put the working directory back to the state it was in that time
Git checkout [hash code/tag]
Can use either whole hash code or first seven characters
head detached
current commit isn’t the latest commit
get back to the latest commit
git checkout master
to add a tag to a commit (can help to memorize important commits)
git tag [parameter]
git tag
display previously added tags
allow us and others to work on different things, like features, at the same time
branches
default branch of every repository
master branch
git branch
show existing branches
create new branch
git branch [name]
*indicates which branch we are on
switch to another branch
git checkout [branch name]
display logs that makes reading them a lot easier
git log –graph
using ………….. we can specify what we want Git to do in a more precise way
flag (eg: –graph)
view branches and divergence of commits
git lot –graph –all
can see all commits from all branches
neglect unnecessary informations
git log –graph –all –oneline
bring changes together
git merge master
switch to the branch we want to merge into
use git merge followed by the branch name we want to take the changes from
we’ll face conflict when
there are versions of a file with different changes in branches we want to merge
resolve merge conflict
Decide which version to keep
Open a text editor and delete the other version along with the special markings
commit the file
merge tools
as the project grow, more and more merge conflicts appear. It would be great to have a tool to review and resolve them
example merge tool
SemanticMerge
clone remote repository to our local computer
git clone [url]
a name that’s automatically given to a remote for which we don’t specify a name
origin
see where does the remote point to
git remote show origin
if the remote has changes in its branch that we want to bring to our local repository
git fetch [remote name by default origin] [remote branch name]
merge the fetched changes from remote
git merge origin/master master
bring a branch in our local repository up-to-date with its remote version
git pull origin master
fetching and merging at the same time
we should not have any uncommitted local changes before we use git pull
get our local changes to the remote repository
git push origin master
pushes commits from our local repository to the remote
commit changes before we can push them to the remote
staged
files are ready to be committed
unstaged
files with changes that have not been prepared to be committed
untracked
files aren’t tracked by git yet
deleted
file has been deleted and is waiting to be removed from Git
to remove a file from staging area
git reset [filename]
add many files of the same type
git add ‘*.txt’
don’t forget the quotes
see more information for each commit
where new files were added for the first time
where files were deleted
git log –summary
add a remote repository
git remote add origin [repository url]
tell git to remember the parameters
git push -u origin master
next time simply run git push
sometimes when you go to pull you may have changes you don’t want to commit just yet. One option you have, other than committing, is to stash the changes
git stash
to stash your changes
git stash apply
to re-apply your changes after your pull
take a look at what is different from our last commit
git diff HEAD
………. gives you a good overview of changes you have made and lets you add files or directories one at a time and commit them separately
git diff –staged
staged differences
checkout and create a branch at the same time
git checkout -b new_branch
remove the actual files from disk
stage the removal of the files
git rm ‘*.txt’
remove an entire folder
git rm -r folder_of_cats
recursively remove all folders and files from the given directory
if you happen to delete a file without using ‘git rm’ you will find that you still have to ‘git rm’ the deleted files from the working tree
save this step by
git commit -am “Delete stuff”
pull requests
allows the boss of the project to look through your changes and make comments before deciding to merge in the change
merge conflicts
can occur when changes are made to a file at the same time. just need to decide which code to keep.
delete a branch
git branch -d [branch name]
will not let you delete a branch that hasn’t been merged
can use –force (-f) option or use -D which combines -d -f together into one command
undoing a git push
git push -f origin loast_known_good_commit:branch_name
