gitconfig

[color]
  status = auto
  branch = auto
[core]
  excludesfile = ~/.gitignore
	autocrlf = input
	safecrlf = false
[status]
	submoduleSummary = true
[diff]
  compactionHeuristic = true
[push]
  default = simple
[pull]
	rebase = merges
[commit]
	gpgsign = true
[branch]
	autosetupmerge = always
[alias]
  # Basic Shortcuts
  # ---------------
  st = status -sb                                                                   # Smarter status - include tag and branch info
  cp = cherry-pick
  cl = clone
  co = checkout
  cob = checkout -b
  br = branch
  a = add
  aa = add --all
  A = add -A
  au = add -u
  m = merge
  mr = merge --no-edit
  pu = push -u

  # Reset Helpers
  # -------------
  r = reset
  unstage = reset HEAD
  uncommit = reset --soft HEAD~1
  undo = checkout HEAD --
  undoall = checkout -f
  r1 = reset HEAD^
  r2 = reset HEAD^^
  rh = reset --hard
  rh1 = reset HEAD^ --hard
  rh2 = reset HEAD^^ --hard

  # Commit Shortcuts
  # ---------------
  c = commit
  cnv = commit --no-verify
  cs = commit -S
  csnv = commit -S --no-verify
  cr = commit -eF .git/COMMIT_EDITMSG                                               # If commit fails either due to a failed gpg or whatever, use the last message written when commiting again

  # Diff Shortcuts
  # ---------------
  diff = diff --word-diff
  d = diff --word-diff
  dc = diff --cached
  ds = diff --staged                                                                # git ds - Diff your staged changes == review before committing.

  # Stash Shortcuts
  # ---------------
  s = stash
  sl = stash list
  sa = stash apply
  sp = stash pop
  ss = stash save
  slst = !git stash show 'stash@{$1}'
  slsd = !git stash show -p 'stash@{$1}'
  ps = !git s && git pull && git sp

  # Log Shortcuts
  # ---------------
  l = log --show-signature
  ls = log --pretty=format:\"%C(yellow)%h %C(blue)%ad%C(red)%d %C(reset)%s%C(green) [%cn]\" --decorate --date=short                       #  Pretty one-line log with tags, branches and authors
  lsv = !git ls --numstat            #  A verbose ls, shows changed files too
  sig = !git ls --show-signature -1  #  Check for GPG signatures
  lh = log --graph
  la = !git lh --date-order --all 2> /dev/null
  lb = log --graph --simplify-by-decoration
  lba = !git lb --all
  lme = !git ls --author=\"$(git config --get user.email)\" --no-merges
  lod = "!f() { git lme --after=\"$1 0:00\" --before=\"$1 23:59\"; }; f"
  lsd = "!f() { git lme --since=\"$1\"; }; f"
  yesterday = !git lsd '1 day ago' # Know what you did yesterday
  today = !git lod today

	# External Commands
	# -----------------
  # Generate a .gitignore based on given arguments ( For list of arguments do: gi list )
	# e.g.: git ignore osx, php, node, wordpress >> .gitignore
	ignore = "!gi() { curl -L -s https://www.gitignore.io/api/$@ ;}; gi"

  # Open all conflicted files in the default editor
  fix = "!$EDITOR `git diff --name-only | uniq`"

  # Set the user profile to be used when commiting by using the gituser function defined in ~/.profile
  user = "!bash -c -l \"gituser $1\""

  # Open all modified tracked files within the current repo
  session = "!git diff --name-only -z | xargs -0 bash -c '</dev/tty open \"$@\"' x"

  sd = stash list | awk -F: '{ print "\n\n\n\n"; print $0; print "\n\n"; system("git stash show -p " $1); }'

  # Copy last commit message to clipboard
  cpc = !git log -1 --pretty=%B | pbcopy

  # Copy todays git commit messages into one line
  cptoday = !git today --oneline --no-decorate --pretty=format:%s | awk '{print $0}' ORS='. ' | pbcopy
  cplod = "!f() { git lme --after=\"$1 0:00\" --before=\"$1 23:59\" --oneline --no-decorate --pretty=format:%s | awk '{print $0}' ORS='. ' | pbcopy; }; f"
  cplsd = "!f() { git lme --since=\"$1\" --oneline --no-decorate --pretty=format:%s | awk '{print $0}' ORS='. ' | pbcopy; }; f"

  # Edit recently modified files
  edit = !vim $(git status --porcelain | awk '{print $2}')
  code = !code $(git status --porcelain | awk '{print $2}')