Github Flashcards
How to check the current git CLI version?
git version
How to init a local git repository?
git init [(repo_name)]
With (repo_name), it creates a folder instead.
What is a stash in github?
Its a snapshot of a state that is stored for later use, after creating one, the working dir returns to the previous commit state.
How to create a stash in git CLI?
git stash
How to seek help for a git command?
git help [(command_name)]
if no command_name is specified, git shows general commands help.
How to set the current username and password of the git user on the global level?
git config –global user.name (name) and
git config –global user.email (email).
How to clone a github repo?
git clone (repo.git)
how to list a git config in the console
git config –list
how to add to the staging area: a single file, all files
git add (filename) | git add .
How to commit a staging area?
git commit -m or git commit, to comment with an editor
How to express add all already tracked files and commit then?
git commit -am “message”
How to open the config file with the chosen editor
git config -e
Where is the global and local git config file stored?
global: C:/Users/Youruser/.gitconfig
local: inside the .git folder
What is the usefulness of git pull (repo) [(branch)]?
to put your local repo in sinc with the remote one in case someone made a change before.
Whats the difference between fetch and pull?
Fetch only updated the references while pull updates the references and downloads the differences.
What is forking?
Forking means you will get a copy of a remote repo to your github ID (not to your local computer)
how to list all tracked files?
git ls-files
how to unstage files?
git restore –staged
how to remove newly created files from working dir
git restore (filename)
how to move/rename files?
git mv (actual_dir/name) (new_dir/name)
why is the command git add -A useful?
If renaming or changing dir of files without using git mv, the git will see that as two operations: the deletion of a file, and the addition of another, it cannot match the index of the two operations as if it belongs to the same file, thus creating a new file index if you decide to commit.
This can lead to problems when pulling for example, because instead of replacing a file with index X, it may replace another file with another index instead.
how to remove any git files?
git rm (filename)
how to log git commits?
git log
how to log git commits in one line?
git log –oneline
how to log git commits from a author?
git log –author=”(name)”
how to log git commits by date?
git log –since=’x days ago / dd/[mm]/[yy]’
how to log git commits with graphics?
git log –graph
how to log git commits of a specific file?
git log (filename)
how to log git commits for a specific file even if the file was renamed at one point?
git log –follow (filename)
what are git aliases and how to create one?
are ways of shortcuting commands
to create:
git config [–global] alias.(commandName) “(command)”
*(command) excludes the initial ‘git’ from beginning of line.
how to ignore some files?
creating a .gitignore file and placing paths to the folders/files
how to log git commits across all branches?
git log –all
how to log files from a starting commit to another?
git log (commitID1) (commitID2)
how to check changes between working dir and staging area?
git diff
how to check changes between working dir and last commit(HEAD)?
git diff HEAD
how to check changes between last commit and staging area?
git diff HEAD –staged
how to check changes between two commits?
git diff (commitID1) (commitID2)
command to check alterations between working dir and staged area for a specific file
git diff (filepath)
how to write the difference between the local master and the ‘origin’ repo master branch?
master and origin/master
how to check differences between two branches?
git diff branch1 branch2
p4merge
a tool to be evoked by git CLI to resolve merge issues and see differences between areas
steps necessary to config a diff/merge tool to be used with git
on config:
- set the tool name
- set tool path
configure diff or merge tools names to be used with git
git config [–global] diff.tool (toolname)
git config [–global] difftool.path ‘path\to\file.exe’
git config [–global] merge.tool (toolname)
git config [–global] mergetool.path ‘path\to\file.exe’
what does difftool.prompt (boolean) do?
prompts or skips and opens the tool directly
How to write a documentation to the github repo?
create a README.md (md stands for mark-down) and pushes it to github remote repo.
# symbol makes a primary text size ## makes a secondary ### tertiary nothing- writes normal text
branching is
a new isolated development path that also tracks a different history
creating a new branch
git branch (name)
going to the newly created branch
git checkout (branchName)
renaming an existing branch
git branch -m (actualName) (newName)
deleting a branch
git branch -d (name)
listing all branches (including remote)
git branch -a
creating a new branch and changing to it with the same command
git checkout -b (newBranchName)
merging in git is
the merging of branches alterations, if two files with the same index was modified, then a merging conflict needs to be resolved, often with git mergetool
merging a branch to master
(at master) git merge (branchName)
merging fast-forwarding method happens when
parent branch has no commits after the off-branching, it simply integrates the parent with the offbranch, usually faster
force non fast-forwarding when merging branches
git merge (branchName) --no-ff preserves branching history even if one of the branches has no subsequent commits, create a 3-way commit
rebasing is useful for
when you dont wanna merge a branch yet but there are features in the parent branch that you want to integrate,
rebasing a branch to master
(at off-branch) git rebase master
git rebase –abort is
when you are resolving rebasing conflicts and dont wan to continue the operation of rebasing
git rebase –continue is
when you want to continue resolving rebasing conflicts or finally rebase
git pull –rebase does:
instead of creating a merge in branching history, puts your work ahead of all pulled commits and keeps them in the same history
tagging in git is and why is it useful?
tagging are references with descriptions or not that point to a commit and generally is used to mark releases and milestones
creating a tag
git tag (name)
creating an anotated tag
git tag -a (name)
shortcut to create an anotated tag
git tag (name) -m “(message)”
creating an anotated tag for a previous commit
git tag -a (name) (commitID)
force a created tag to point to another commit
git tag (name) -f (commitID)
pushing a tag to a remote repo
git push repo/branch (tag)
when pushing to a repo, it also pushes the commit the tag is attached to
pushing all tags to a remote repo
git push repo/branch –tags
how to remote a tag from a remote repo
git tag push repo/branch :(tag)
git commit –amend is
a way to rephrase the message from the last commit
what is git stashing and why is it useful
its a way of saving the work for later and returning the working dir to the HEAD state
creating a git stash
git stash
applying the last stashed working dir
git stash apply
deleting the last stash created
git stash drop
git stash does not include untracked files, how to include it?
git stash -u
shortcut to apply and delete a stash
git stash pop
how to create a stash/multiple stashes with descriptions?
git stash save -m “(description)”
listing all stashes
git stash list
applying a specific stash
git stash apply stash@{n}
emptying the stash list
git stash clear
shortcut to create a stash, relate it and checkout to a branch, apply the stash and drop it
git stash branch (name)
