Git Flashcards
stage file(s) in git start tracking file(s) in git
git add «file1» («file2» «file3»)
git add «folder»
» adds precisely this content to the next commit
show git commit history of the branch
git log
what is a git remote?
a label to a url
add git remote with a label?
git remote add «remote name» «remote label»
show git remotes and their remote URLs
git remote -v
stage all file modifications and new files in git
git add .
show local git branches
git branch
show remote git branches
git branch -r
show all git branches
git branch -a
git branch –all
create and switch to new git branch
git switch -c «branch»
git checkout -b «branch»
download git repository
git clone «repository url»
update local cache of specific git remote and remove outdated branch trackings
git fetch «remote» –prune
download git repo to specific folder
git clone «repository url» «folder»
show short version of git status
what is left and what is right?
git status -s
» left: status of staging area
» right: status of workspace
show differences between git staging area and workspace
git diff
show differences between git staging area and last commit
git diff –cached
git diff –staged
commit all already tracked files in git
git commit -a
delete file(s) and remove file(s) from git as well
git rm «file1» («file2 «file3»)
delete file(s) and remove file(s) from git when content was modified or staged
git rm -f «file1» («file2 «file3»)
remove file(s) from git only
git rm –cached «file1» («file2 «file3»)
show preformatted git log
git log –pretty=oneline/short/full/fuller
show git logs with ASCI graph
git log –graph
show all git commits that changed a specific string
git log -S «string»
show all git commits with specific string in commit message
git log –grep=«string»
show all git commits without merge commits
git log –no-merges
change git commit message
add or update files of last commit
git commit –amend
» overwrites commit with current staging area
unstage file in git
git reset «file»
git restore –staged «file»
*git unstage «file»
reset file in workspace to status of last git commit
git checkout – «file»
what is the difference between git fetch and git pull?
pull = fetch + merge
change name of git remote
git remote rename «old name» «new name»
what additional information does an annotated git tag contain apart from tag name?
» tagger email
» tag date
» tag message
create lightweight git tag
git tag «tag name»
create annotated git tag with a message
git tag -a «tag name» -m «commit message»
put leightweight tag on existing git commit
git tag «commit» «tag name»
upload specific git tag on the remote
git push «remote» «tag name»
delete local git tag
git tag -d «tag name»
delete branch on git remote
git push «remote» –delete «remote branch»
git push «remote» -d «remote branch»
git push «remote» :«remote branch»
create alias for git command
git config –global alias.«alias name» ‘«git command»’
show all git commits of specific branch
git log «local branch»
show all git commits of all branches
git log –all
delete local git branch
git branch -d «local branch»
how does ‘git merge «branch»’ work?
» tries to merge «branch» into current branch
If the merge fails:
» resolve merge conflicts
» stage resolved files
» complete with ‘git commit’
show all merged in git branches
git branch –merged
show all not yet merged in git branches
git branch –no-merged
update local cache of specific git remote
git fetch «remote»
» new remote branches don’t create local copies
push git branch to specific remote branch
git push «remote» «local branch»:«remote branch»
create, name and switch to branch and track specific remote git branch
git switch -c «local branch» «remote»/«remote branch»
git checkout -b «local branch» –track «remote»/«remote branch»
create, name and switch to branch and do not track any remote branch
git switch -c «branch» –no-track
git checkout -b «branch» –no-track
set or update the current git branch’s tracking to specific remote branch
git branch -u «remote»/«remote branch»
get git remote tracking status of all branches
git fetch –all; git branch -vv
rebase git branch onto another branch
git rebase «base branch» «head branch»
add file removal(s) to git staging area
git add «file1» («file2 «file3»)
push a rebased git branch to remote
git push «remote» «local branch» –force-with-lease
merge in whole git branch as a commit
git merge –squash «local branch»
do one time git pull by url
git pull «remote url»
show git commits of one branch since last common ancestor with another branch
git log «old branch»..«new branch»
git log ^«old branch» «new branch»
git log «new branch» –not «old branch»
show git commits of both branches since last common ancestor with another branch
git log «branch1»…«branch2»
show git commits with short hashes
git log –abbrev-commit
show a git commit’s details
git show «commit»
show a git commit parent’s details
git show «commit»^
enter interactive git staging
git add -i
partially add git file
git add -p «file»
save current work on tracked files without git commit and reset workspace
git stash
restore last saved uncommitted work in git
git stash apply
restore older than last saved uncommitted work in git
git stash apply «stash number»
show all saved uncommitted work in git
git stash list
restore last saved uncommitted work and git staging
git stash apply –index
save current work on tracked files without git commit but keep the git staging and reset workspace
git stash -k
save current work without git commit including untracked files and reset workspace
git stash -u
save current work without git commit including untracked and explicitly ignored files and reset workspace
git stash -a
partially save parts of current work without git commit and reset workspace
git stash -p
create git branch from last saved uncommitted work
git stash branch «branch name»
show git history of a specific function in s specific file
git log -L :«function name»:«specific file»
add or update files of last git commit without changing commit message
git commit –amend –no-edit
» overwrites commit with current staging area
interactively rewrite git history of last «X» commits
git rebase -i HEAD~«X»
reset branch to a specific git commit and clear staging area
git reset «commit»
» keeps workspace
reset branch to a specific git commit and put newer commit contents in staging area
git reset –soft «commit»
» keeps workspace
reset branch and workspace to a specific git commit and clear staging area
git reset –hard «commit»
» risk of loosing data (!)
add or reset file in staging area from another git commit
git reset «commit» – «file»
what does the git – option mean?
do not interpret any more command arguments as options
cancel a merge in git
git merge –abort
merge and ignore git whitespace issues
git merge -Xignore-all-space
git merge -Xignore-space-change
» treats one ore more whitespace characters as equivalent
merge in a file from another git commit or branch
git checkout «commit/branch» «file»
reset a file’s git merge conflict markers
git checkout –conflict «file»
reset and show details of a file’s git merge conflicts
git checkout –conflict=diff3 «file»
solve git merge conflict by choosing the file’s workspace version
git checkout –ours «file»
solve git merge conflict by choosing the file’s merge branch version
git checkout –theirs «file»
show log of full git merge
git log –oneline –left-right HEAD…MERGE_HEAD
show log of git merge conflict commits
git log –oneline –left-right –merge
show log of git merge conflict differences
git log –oneline –left-right -p
undo a git commit by doing another cancelling commit
git revert «commit to undo»
fake the git merge of another branch into current branch
git merge -s ours «incoming branch»
show git history of a file’s line range
git blame -L «from line»,«to line» «file»
show git history of a file including line movements from other files
git blame -C «file»
how tu use git binary search to find erroneous commit
git bisect start
git bisect bad (marks current state as bad)
git bisect good «commit» (was last good commit)
» git bisect good/bad
git bisect reset
add git submodule from URL
git add submodule «submodule url»
download a git repository including all submodules (and all their submodules)
git clone «repository url» git submodule init git submodule update ------------------- git clone «repository url» git submodule update --init (--recursive) ------------------- git clone «repository url» --recurse-submodules
update all git submodules from it’s remote tracking
git submodule update –remote
» puts submodule into detached HEAD state
update a specific git submodule it’s remote tracking
git submodule update –remote «submodule»
set a git submodule’s tracking branch
git config -f .gitmodules submodule.«submodule name».branch «remote tracking branch»
update git submodule (and their submodule) after pull from superproject
(git pull) git submodule update --init (--recursive)
update git submodule from it’s remote keeping our changes
cd «submodule folder» git checkout «new branch» cd .. (back into superproject folder)
git submodule update –remote –merge/rebase
- git supdate
upload local changes of git submodule
cd «submodule folder»
git push
——————-
git push –recurse-submodules=on-demand
» tries to push submodule before pushing superproject
- git spush
create new git branch of project with submodule(s)
git submodule foreach ‘git switch -c «branch»’
show differences between git staging area and workspace including submodules
git diff
git submodule foreach ‘git diff’
——————-
*git sdiff
set git config variable
git config (–global) «setting» «value»
create git bundle file of a commit range and name it
git bundle create «file name».bundle «head commit» ^«base commit»
git bundle create «file name».bundle «base commit»..«head commit»
create git bundle file of the whole branch and name it
git bundle create «file name».bundle HEAD «branch»
check if git bundle is valid
git bundle verify «file name»
create new git branch
git branch «branch name»
create new git branch based on a commit
git branch «branch name» «commit»
show all git tags
git tag
show all configured git aliases
git config –list | grep alias
show last git commit
git log -1 HEAD
*git last
upload a local branch to the git remote
git push «remote» «local branch»
upload all local branches to the git remote
git push –all «remote»
upload a local branch to a specific branch of the git remote
git push «remote» «local branch»:«remote branch»
upload a local branch to the git remote and save as remote tracking default
git push -u «remote» «local branch»
» «remote» and «local branch» can be omitted from now on
stage all file modifications and deletions in git
git add -u
stage all file modifications, new files and deletions in git
git add -A
update local branch cache of this branch’s git remote
git fetch
» new remote branches don’t create local copies
show not yet merged in branches into specific git branch
git branch –merged
show merged in branches into specific git branch
git branch –no-merged
rebase current branch on top of another base git branch?
git rebase «base branch»
update local cache of all git remotes and remove outdated branch trackings
git fetch –prune
remove folder from git and delete folder from workspace
git rm -r «folder»
remove folder from git and delete folder from workspace
git rm -r «folder»
update all new git tags on the remote
git push «remote» –tags
delete tag on git remote
git push «remote» –delete «tag name»
git push «remote» -D «tag name»
git push «remote» :«tag name»
update local cache of all git remotes
git fetch –all
» new remote branches don’t create local copies
update local cache of a specific git remote’s branch
git fetch «remote» «remote branch»
switch back to previous git branch
git switch -
create, switch to and do not track local copy of a specific git remote’s branch
git switch -c –no-track «remote»/«remote branch»
git checkout -b «remote»/«remote branch»
create, switch to and track local copy of a specific git remote’s branch
git switch –track «remote»/«remote branch»
git checkout –track «remote»/«remote branch»
create branch based on a git commit
git switch -c «branch» «commit»
switch to git commit and detach from HEAD for temporary inspection
git switch –detach «commit»
git checkout «commit»
create and track local copy of remote git branch and switch to it
git switch «remote branch»
git checkout «remote branch»
set or update another local branch’s git tracking to a specific remote branch
git branch -u «remote»/«remote branch» «local branch»
unite last «X» git commits to one
git reset –soft HEAD~«X»; git commit
show all git commit’s details since last common ancestor of two branches
git diff –left-right «branch1»…«branch2»
show git commit’s details of a branch since last common ancestor with another branch
git diff «old branch»..«new branch»
git diff ^«old branch» «new branch»
git diff «new branch» –not «old branch»
restore last saved uncommitted work in git and delete entry
git stash pop
restore older than last saved uncommitted work in git and delete entry
git stash pop «stash number»
show differences between last saved uncommitted work and preceding git commit
git stash show
show differences between older than last saved uncommitted work and preceding git commit
git stash show «stash number»
create git branch from older than last saved uncommitted work
git stash branch «branch» «stash number»
find common ancestor of two git branches
git merge-base «branch1» «branch2»
interactively rebase current git branch on top of another base branch?
git rebase -i «base branch»
undo last git commit
git reset –soft HEAD^
redo last git commit (after undoing it) and edit commit message
(git reset –soft HEAD^)
git commit -a -c ORIG_HEAD
redo last git commit (after undoing it) with the old commit message
(git reset –soft HEAD^)
git commit -a -C ORIG_HEAD
reset file in workspace back by «X» git commits
git checkout HEAD~«X» «file»
add or reset workspace file from another git commit
git checkout «commit» «file»
reset git staging area to last commit
git reset
clear staging area of git project with submodule(s)
git submodule foreach ‘git stash’
initialize and push local project to github
» create new GitHub repository (without readme) » git init » git add . » git commit -m 'First commit' » git remote add origin «repository url» » git push -u origin master
remove folder from git only
git rm –cached -r «folder»
» -r stands for recursive
add and commit all new changes in git
git commit -am ‘«commit message»’
