Git cheatsheet

Commands

git checkout -b __newbranch__ : get a new branch and switch to it
git checkout -b __branchname__ / __branchname__ : get a local copy of a remote existing branch
git checkout __branchname__ : switch branch
git checkout --orphan __branchname__ : create branch without full history
git log -n X -p : show X last commits with diffs
git log __branchA__ ^__branchB__ : commits in branch A that aren't in branch B
git log --pretty=oneline --stat --all __foldername__ : modified files under a given folder
git fetch
git pull origin __branchname__
git merge --no-ff __sourcebranch__ : merge into current branch source one without rebase/FF
git push origin __destinationbranch__ : push merges/changesets to a branch
git remote show origin : display the path of the repository
git remote set-url origin xxx : Change remote URI to xxx
git remote rm origin : Remove remote URI
git remote add origin [email protected]:CartoDB/cartodb.js.git : Add remote URI (for example after adding SSH key with ssh-add ~/.ssh/id_rsa). Must first git remote rm origin to remove previous one.
git add xxx : add files (use . for everything, folder/.. for folder recursive children)
git commit : commit changes
git status : show status of uncommited files
git checkout __file__ : revert a file
git checkout __branchname__ __file__ : Checkout all changes to file from branch branchname into current
git checkout __revision__ . : revert a full branch to specified revision if not commited
git revert __commit1__ __commit2__ ...: Reverts certain commits if commited
git reset __revision__ .: revert a full branch to specified revision if commited
git clean -f : remove all local uncommited modifications
git branch : display local branches, active one is with a *
git diff : Show changes in files
git rebase __branchname__ : rebases current branch with specified branch (fetches remote branch changes and then adds yours at the tip)
git rm __filename__ : delete a file from branch and filesystem
git branch -d __branchname__ : delete a local branch
git push origin --delete __branchname__ : delete a remote brach
gitk __filename__ : show visual git log
git reset --soft HEAD~1 : reset to last commit (even if pushed). Can re-commit stuff but if already pushed will need to push with --force.
git log origin/__branchname__..__branchname__ : Show diff between local commits and remote commits
git config --list : List currently setup config values
git config --global user.name "Kartones" : Setup global user name
git config --global user.email "[email protected]" : Setup global user email
git config --global credential.helper 'cache --timeout=28800' : Make git cache credentials for 8 hours
git config --global color.ui true : Activate colors in diffs, etc.
git config --global core.autocrlf true : Fix Convert newlines to Unix-style ones (Windows)
git config --global core.autocrlf input : Fix Convert newlines to Unix-style ones (Unix)*
git config --global pager.log 'diff-highlight | less': Better diff highlighting (same for 3 following options)
git config --global pager.show 'diff-highlight | less'
git config --global pager.diff 'diff-highlight | less'
git config --global interactive.diffFilter diff-highlight
git submodule update --init --recursive : Init and update all submodules
git submodule init && git submodule update : Retrieve and update all submodules (alt)
Switch from current branch having a submodule to a branch without it:

rm -Rf __submoduledir__
git reset && git checkout .
git checkout __branchname__

git pull https://github.com/__username__/__reponame__.git __branchname__: Merge a pull request to local branch
git stash: Stash current changes
git stash apply: Unstash and merge stored changes
git checkout --theirs xxxx git checkout --ours xxxx: Keep changes from incoming branch or local one, respectively.
git blame -M: Blames original commit, not the move commit
git blame -CCC: Looks at all commits in history
git cherry-pick __commit__: merges and commits a specific commit to current branch
git reflog + git reset HEAD@__commit__: show all changes on all branches and revert to a specific one
git commit --amend: Squash a change on previous commit and change the commit message
git diff --staged: Show both staged and unstaged changes that you will commit

Searches

Issues in which you're mentioned
Pull requests in which you're mentioned
All open issues and pull requests of organization TEST: Change to proper organization name, and for example can filter to all assigned to you

Third-party Tools

tig: to navigate commits & branches

Github:

Commands for automatically closing tickets when merged to default branch
Search to display all issues/PRs of an organization:

https://github.com/issues?utf8=%E2%9C%93&q=is%3Aopen+org%3Athemotion+sort%3Aupdated-desc

Additionally, filter to things assigned to me or involving me:

https://github.com/issues?utf8=%E2%9C%93&q=is%3Aopen+org%3Athemotion+sort%3Aupdated-desc+involves%3Akartones

Tutorials

Atlassian Git tutorial
Git Cookbook
Most Common Git tips & tricks (awesome list)

abrocod/git-cheatsheet.md

Commands

Searches

Third-party Tools

Tutorials