Cheatography
Login Register

GIT - Everyday use Cheat Sheet

A Software › Nope cheat sheet in English by TME520

A quick reference guide for everyday work with GIT.

Git Configuration Basics Branches Concepts Daily Everyday Repositories Commits
12,311 views 2,385 downloads 26 Apr 2020 History
PRs
Download

Key concepts

HEAD
Head is your current branch. You can see what HEAD points to by typing cat .git/HEAD,
Remote
Remotes are non-local reposi­tories you can interact with (push/­pull). The default remote is origin (you can see that using git remote -v).
Branch
Branches are a way of safely work on new features without messing other peoples work (one feature, one branch).
Commit
A commit is a change or a set of changes you wish to register and save.

Reposi­tories

Create a local repository
mkdir ./my_repo && cd ./my_repo && git init
Clone a repository from GitHub
Clone a specific branch from a repo

Branches

List branches
git branch
git branch --list
Clone a specific branch
git clone -b <br­anc­h> <re­mot­e_r­epo>
git clone -b develo­pment git@gi­thu­b.com:user/­myp­roj­ect.git
Switch to an existing branch
git checkout <br­anc­h>
git checkout feat/r­obe­rt/­add­-pu­b-h­oli­day­s-2020
Switch to a new branch
git checkout -b <ne­w_b­ran­ch>
git checkout -b conf/m­arc­el/­use­-Ed­ito­rConfig
Push changes to a remote branch
git push origin <br­anc­h>
git push origin fix/pa­tri­ck/­rem­ove­-pa­ras­ite­-ch­ars­-fr­om-­con­fig­-file
Delete a branch
git branch -d <br­anc­h>
git branch -d feat/r­aja­/co­unt­-ap­i-f­ailures
Integrate your feature branch to the main
git merge <br­anc­h>
git merge main
Using branches, several developers are able to work together on the same code base, the same project.
git merge is not usually done manually, but is managed by your pull request system.

Getting out of (mild) troubles

Cancel untracked uncommited local changes
git reset --hard && git pull remote <re­mot­e_b­ran­ch>

Basic config­uration

Set your name
git config --global user.name "John Doe"
Set your email address
git config --global user.email johndo­e@e­xam­ple.com
Set your default editor
git config --global core.e­ditor emacs

Dot files

.gitignore
Specifies intent­ionally untracked files that Git should ignore. Files already tracked by Git are not affected.
.gitat­tri­butes
Gives attributes (end of line type, diff type, merge type...) to certain files.
Examples of .gitignore files: click here
Examples of .gitat­tri­butes files: click here

Basic workflow

Clone a repo
Create a new branch
git checkout -b conf/y­u/a­dd-­api­-en­dpo­int­s-t­o-m­oni­toring
Check repo status and current branch
git status
Add changes to next commit (track files)
git add -A
Commit with a message
git commit -m "­Som­etimes dogs are grey"
Refresh current local branch with remote branch
git pull origin develo­pment
Push changes to remote
git push origin conf/y­u/a­dd-­api­-en­dpo­int­s-t­o-m­oni­toring
git push uploads your commits to the remote reposi­tory.
git pull is a combin­ation of git fetch and git merge. It gets the updates from remote repository and applies the latest changes to your local.

Commits

Add one file to a future commit
git add <fi­le>
git add benchm­ark.c
Add all files to a future commit
git add -A
Commit with a message
git commit -m "­<me­ssa­ge>­"
git commit -m "­Initial commit­"
Change the message of the latest commit
git commit --amend -m "­<ne­w_m­ess­age­>"
git commit --amend -m "­Bea­utiful commit­"
Cancel a commit
git log  -- oneline
 
git revert <co­mmi­t_i­d>
Git commits are checkp­oints in the develo­pment process which you can go back to later if needed.
Git commit saves your changes only locally.
git revert won't delete the commit, it will instead create a new one cancelling the other.

Badges

Nice Cheat Sheet

Comments

No comments yet.

Cheatography n. The art of mapping complex subjects into clear, instantly navigable reference guides.