Config

[alias]
  co = checkout
  ci = commit
  st = status
  br = branch
  lg = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
  type = cat-file -t
  dump = cat-file -p
  pr = pull --rebase
  pf = push --force-with-lease
  ri = rebase -i
  rc = rebase --continue
  rs = rebase --skip
  ra = rebase --abort
  mt = mergetool
  sur = submodule update --recursive
  pa = pull --all
  fa = fetch --all
  cb = checkout -b
  me = merge --no-ff
  cp = cherry-pick
  fp = format-patch -k
  dlc = reset --hard HEAD~
  cf = clean -f -d
  ak = am -k --ignore-date -3
  delete-branch = "!f() { git branch -D $1 && git push origin --delete $1; }; f"
  ccd = !test $(find . -name "*.patch" | wc -l) -eq 0 && git fp HEAD -$1 && git reset --hard HEAD~$1 && git ak *.patch && rm *.patch && :

Shell aliases

alias gg='git gui'
alias gk='gitk'

Save encrypted credentials (linux)

sudo apt-get install libgnome-keyring-dev
sudo make --directory=/usr/share/doc/git/contrib/credential/gnome-keyring
git config --global credential.helper /usr/share/doc/git/contrib/credential/gnome-keyring/git-credential-gnome-keyring

Cheatsheet

Initialization

git init
git clone https://github.com/5pilow/git-config-cheatsheet.git
git remote add origin https://github.com/5pilow/git-config-cheatsheet.git

Changes

git reset HEAD path/to/file.txt     // reset unstaged change
git checkout -- path/to/file.txt    // discard staged change

Branches

git checkout -b new_branch
git branch -d branch_to_delete
git branch -D branch_to_delete_brutally

Rebase

git rebase -i HEAD~2                // 2 last commits
git rebase -i <SHA-1>               // From a specific commit
git rebase -i --root                // Rebase from the first commit
git dlc                             // Delete last commit

Stashes

git stash
git stash list
git stash pop
git stash pop stash@{0}

Commits

git reset --hard HEAD~15      // Delete last 15 commits

Patches

git format-patch -1 HEAD                       // Create a patch with the last commit
git am --signoff 0001-path-blablabla.patch     // Try to apply the patch
git apply --reject 0001-path-blablabla.patch   // If there are conflicts, apply possible modifications

Config

git config user.name "Foo Bar"
git config user.email "email@example.com"

Search

git log --all --full-history -- **/some_file.*

Utilities

Clean .orig files:

git clean -f 

Cancel operation(s):

git reflog
git reset --hard HEAD@{9}