[alias]
	rb = rebase -S
	co = checkout
	ci = commit -S
	ic = commit -S
	cp = cherry-pick -S
	br = branch
	st = status
	lg = log --graph --format='%C(yellow)%h%Creset -%C(auto)%d%Creset %s %C(green)(%ar) %C(cyan)<%an>%Creset'
	branches = branch -a
	desc = describe
	last = log -1 HEAD
	pom = pull origin master
	remotes = remote -v
	tags = tag -l
	unstage = reset HEAD --
	ft = fetch --all
	rs1 = reset --soft HEAD~1
	rs2 = reset --soft HEAD~2
	rs3 = reset --soft HEAD~3
	rs4 = reset --soft HEAD~4
	rs5 = reset --soft HEAD~5
	rs6 = reset --soft HEAD~6
	rs7 = reset --soft HEAD~7
	rs8 = reset --soft HEAD~8
	rs9 = reset --soft HEAD~9
	rh = reset --hard
	rh1 = reset --hard HEAD~1
	rh2 = reset --hard HEAD~2
	rh3 = reset --hard HEAD~3
	rh4 = reset --hard HEAD~4
	rh5 = reset --hard HEAD~5
	rh6 = reset --hard HEAD~6
	rh7 = reset --hard HEAD~7
	rh8 = reset --hard HEAD~8
	rh9 = reset --hard HEAD~9
	df = diff --compact-summary master
	oc = checkout
	ps = push
	psh = push
	phs = push
	psuh = push
	phus = push
	phsu = push
	puhs = push
	push-f = push -f
	puhs-f = push-f
	push0f = push -f
	puhs0f = push -f
	add-p = add -p
	ds = diff --staged

function update() {

git fetch --multiple upstream origin

if [ -n "$1" ]
then
  git checkout $1
  git merge remotes/upstream/$1
else
  git checkout master
  git merge remotes/upstream/master
fi

git push -f

}

[alias]
  co = checkout
  cob = checkout -b
  com = checkout master
  commies = checkout main
  st = status
  adddd = add -A
  cim = commit -m
  pushoo = push origin HEAD
  br = branch
  po = pull origin
  hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
  type = cat-file -t
  dump = cat-file -p
  ws = diff --check
	ciam = !git add -A && git commit -n -m
  pulloo = pull origin
  rename = branch -m
  showalias = config --get-regexp alias
  delete = branch -D
  f = fetch
  edit = config --global --edit
	undo = reset HEAD~

# Git
alias ungit="find . -name '.git' -exec rm -rf {} \;"
alias gb='git branch'
alias gba='git branch -a'
alias gc='git commit -v'
alias gca='git commit -v -a'
alias gf='git fetch'

if [ $(uname) == "Darwin" ]; then
  alias gcb="git branch | grep '^\*' | cut -d' ' -f2 | pbcopy"
fi

if [ $(uname) == "Linux" ]; then
  alias gcb="git branch | grep '^\*' | cut -d' ' -f2 | xclip -sel c"
fi

# Commit pending changes and quote all args as message
function gg() {
    git commit -v -a -m "$*"
}
alias gco='git checkout'
alias gcod='git checkout develop'
alias gcob='git checkout -b'
alias gd='git diff'
alias gdm='git diff master'
function gdx() {
  git diff $1 $2 | gitx
}
alias gl='git pull'
alias gnp="git-notpushed"
alias gp='git push'
alias g='git status'
alias ga-modified="git status | grep modified | cut -d':' -f2 | xargs git add"

# Get and merge upstream repo
alias gups='git fetch upstream && git merge upstream/master'
alias eg='vim .git/config'
alias egg='vim ~/.gitconfig'

# Lists all merged branches and deletes the local branchs
alias gclean="git branch --merged | grep -v -i -E 'master|main|develop' | xargs -n 1 git branch -d"

[alias]
  br = branch
  ci = commit
  co = checkout
  datetag = !git tag `date "+%Y_%m_%d_%H%M"`
  df = diff

  # Show modified files in last commit.
  diffall = diff HEAD
  diffstaged = diff --staged
  nextrelease = log origin/dev ^origin/main --no-merges
  dl = "!git ll -1"

  # Show a diff last commit.
  dlc = diff --cached HEAD^
  filelog = log --oneline --no-merges --
  fl = log -t u
  init = init --template ~/.git_template

  # List oneline commits showing relative dates.
  ld = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative

  # List oneline commits showing dates.
  lds = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
  lg = log -p

  # List commits showing changed files is invoked with git ll and looks like this.
  ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
  logm = log --author="kepford" --decorate
  lol = log --graph --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
  lola = log --graph --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --all
  lolm = log --author="kepford" --decorate --pretty=oneline --abbrev-commit
  ls = ls-files

  # Copies today's commits by me on a branch.
  today = "!git log --since=6am --author="kepford" --decorate --abbrev-commit | grep -vwE \"(Author:|Date:)\" | pbcopy | pbpaste | cat"
  sa = stash apply
  sl = stash list
  ss = stash save
  st = status

  # Commits on current branch. Assumes the branch was created from develop.
  thisbranch = log --no-merges dev..
  undolast = reset --soft Head^
  unstage = reset HEAD

  # diff-highlight http://theunixtoolbox.com/git-diff-highlight/
  worddiff = !git diff --color | diff-highlight | less -r

	se = !git rev-list --all | xargs git grep -F

[alias]
  i = "!f(){ git init && git commit -m 'initial commit' --allow-empty; };f"
  s = status -sb
  l = log -10 --oneline
  rl = reflog -10
  cb = checkout -b
  b = branch
  bd = branch -d
  ch  = "!f(){ git checkout --quiet \"$1\" && git status; };f"
  a = add
  aa = "!f(){ git add --all && git status; };f"
  co = commit
  oc = commit
  f = fetch
  d = diff
  ds = diff --staged
  pr = pull --rebase
  rbi = rebase --autosquash -i
  ca = commit --amend
  r = reset
  excl = "!f(){ [ ! -z \"$1\" ] && echo \"$1\" >> .git/info/exclude; };f" # TODO: support multiple arguments with shift
  readd = "!git diff --staged --name-only | xargs git add"
  rd = "readd"
  fixup = commit --fixup

[alias]
  co = checkout
  cob = checkout -b
  coo = !git fetch && git checkout
  br = branch
  brd = branch -d
  st = status
  aa = add -A .
  unstage = reset --soft HEAD^
  cm = commit -m
  cma = commit -am
  amend = commit --amend -m
  fix = commit --fixup
  undo = reset HEAD~1
  rv = revert
  cp = cherry-pick
  pu = !git push origin `git branch --show-current`
  fush = push -f
  mg = merge --no-ff
  rb = rebase
  rbc = rebase --continue
  rba = rebase --abort
  rbs = rebase --skip
  rom = !git fetch && git rebase -i origin/master --autosquash
  save = stash push
  pop = stash pop
  apply = stash apply
  rl = reflog