gitconfig

[user]
	name = Izzet Mustafaiev
	email = izzet@mustafaiev.com

[shell]
	# Default SSH username.
	username = webdizz

[github]
	# GitHub username for command-line tools.
	user = webdizz

[core]
  autocrlf = false
  excludesfile = /opt/boxen/config/git/gitignore
  trustctime = false
  editor = vim
  whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
  longpaths = true

[push]
  default = matching

[credential]
	helper = osxkeychain

[hub]
  protocol = https

[rerere]
  # Remember my merges
  # http://gitfu.wordpress.com/2008/04/20/git-rerere-rereremember-what-you-did-last-time/
  enabled = true

[color]
  ui = true

[color "branch"]
  current = yellow reverse
  local = yellow
  remote = green

[color "diff"]
  meta = yellow bold
  frag = magenta bold
  old = red bold
  new = green bold
  whitespace = red reverse

[color "status"]
  added = yellow
  changed = green
  untracked = cyan reverse
  branch = magenta

[github]
  user = webdizz

[alias]
  # add
  a = add                           # add
  chunkyadd = add --patch           # stage commits chunk by chunk
  ai = add -i

  # branch
  b = branch -v                     # branch (verbose)
  ba = branch -a
  bd = branch -d
  bD = branch -D
  br = branch -r

  # commit
  c = commit -m                     # commit with message
  ca = commit -am                   # commit all with message
  ci = commit                       # commit
  amend = commit --amend            # ammend your last commit
  ammend = commit --amend           # ammend your last commit
  cd = commit --amend

  # fetch
  f = fetch
  fo = fetch origin
  fb = fetch build

  # patch
  fp = format-patch

  # checkout
  co = checkout                     # checkout
  com = checkout main       # checkout main
  cod = checkout develop            # checkout develop
  nb = checkout -b                  # create and switch to a new branch (mnemonic: "git new branch branchname...")

  # cherry-pick
  cp = cherry-pick -x               # grab a change from a branch

  # diff
  d = diff                          # diff unstaged changes
  dc = diff --cached                # diff staged changes
  last = diff HEAD^                 # diff last committed change
  dk = diff --check
  dp = diff --patience
  dck = diff --cached --check

  # log
  l = log --graph --date=short
  lst = log --graph --date=short --stat
  lg = log --oneline --graph --decorate
  changes = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" --name-status
  short = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\"
  changelog = log --pretty=format:\" * %s\"
  shortnocolor = log --pretty=format:\"%h %cr %cn %s\"

  # pull
  pl = pull                         # pull
  plo = pull origin
  plom = pull origin main
  plum = pull upstream main
  plod = pull origin develop
  pr = pull --rebase
  pro = pull --rebase origin
  prom = pull --rebase origin main
  prod = pull --rebase origin develop
  prgd = pull --rebase gerrit develop

  # push
  ps = push                         # push
  pso = push origin
  psot = push origin --tags
  psom = push origin main
  psod = push origin develop

  # rebase
  rc = rebase --continue            # continue rebase
  rs = rebase --skip                # skip rebase
  ra = rebase --abort
  ri = rebase --interactive

  # remote
  r = remote -v                     # show remotes (verbose)
  rr = remote rm
  rv = remote -v
  rp = remote prune
  rs = remote show
  rao = remote add origin
  rso = remote show origin
  rpo = remote prune origin

  # merge
  m = merge
  ma = merge --abort
  mc = merge --continue
  ms = merge --skip
  mm = merge main
  md = merge develop

  fk = fsck
  # reset
  unstage = reset HEAD              # remove files from index (tracking)
  uncommit = reset --soft HEAD^     # go back before last commit, with files in uncommitted state
  re = reset
  rh = reset HEAD
  reh = reset --hard
  rem = reset --mixed
  res = reset --soft
  rehh = reset --hard HEAD
  remh = reset --mixed HEAD
  resh = reset --soft HEAD
  filelog = log -u                  # show changes to a file
  mt = mergetool                    # fire up the merge tool

  # stash
  ss = stash                        # stash changes
  sl = stash list                   # list stashes
  sa = stash apply                  # apply stash (restore changes)
  sd = stash drop                   # drop stashes (destory changes)
  sc = stash clear
  sp = stash pop
  ss = stash save
  sw = stash show

  # status
  s = status                        # status
  st = status                       # status
  stat = status                     # status
  sb = status -s -b

  # tag
  t = tag
  tn = tag -n                        # show tags with <n> lines of each tag message
  tl = tag -l
  td = tag -d      # remove tag

  # svn helpers
  svnr = svn rebase
  svnd = svn dcommit
  svnl = svn log --oneline --show-commit

  ls = ls-files

  # Gerrit
  pgod = push origin HEAD:refs/for/develop
  pgod1 = push gerrit HEAD:refs/for/pos1/develop
  pg   = push gerrit

  whois = "!sh -c 'git log -i -1 --pretty=\"format:%an <%ae>\n\" --author=\"$1\"' -"
  whatis = show -s --pretty='tformat:%h (%s, %ad)' --date=short

[format]
  pretty = format:%C(blue)%ad%Creset %C(yellow)%h%C(green)%d%Creset %C(blue)%s %C(magenta) [%an]%Creset

[mergetool "kdiff3"]
	trustExitCode = false
	path = /usr/local/bin/kdiff3
[merge]
	tool = kdiff3
[credential "https://source.developers.google.com"]
	helper = gcloud.sh
[diff "sopsdiffer"]
	textconv = sops -d
[http]
	sslVerify = true
[init]
	defaultBranch = main