.gitconfig

[branch]
  autosetuprebase = always  # default pull strategy is rebase
[merge]
	keepBackup = false;
	tool = vimdiff
[mergetool "p4merge"]
	cmd = /opt/p4v/bin/p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
	keepTemporaries = false
	trustExitCode = false
	keepBackup = false
[mergetool "emerge"]
	path = ~/bin/emerge-for-git
[alias]
  b = bisect
  co = checkout
  cof = checkout -f
  aa = add .
  ad = add
  dd = add
  br = branch
  ci = commit
  st = status -sb
  t  = status -sb
  sh = stash
  vlog = log --pretty=format:'%C(red)%h%Creset %C(cyan)<%an>%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
  glog = log --pretty=format:'%C(red)%h%Creset %C(cyan)<%an>%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative --graph
  cih = commit --amend -C HEAD
  cim = commit -m
  ciam = commit -am
  rb = rebase
  rbh = rebase HEAD
  rbim = rebase -i master
  ri = rebase -i
  rl = reflog show
  d = diff
  dc = diff --cached
  cl = clone
  l = log --oneline -n 20
  u = "!sh -c 'git ft; git rsm; git delete-merged-branches'"
  pl = pull
  ps = push --set-upstream
  rs = reset
  rsh = reset --hard
  rso = reset-upstream --hard
  rr = reset HEAD
  rsm = update-ref refs/heads/master origin/master
  so = remote show origin
  ft = fetch --prune --all
  ls = log --stat -p -1
  mg = merge --ff-only
  mnf = mymerge --no-ff
  ms = merge --squash
  mt = mergeto
  mm = mergeto master
  dc = diff --cached
  cp = cherry-pick
  tr = log --graph --pretty='format:%C(yellow)%h%Creset %s %Cgreen(%an)%Creset %Cred%d%Creset'
  sd = svn dcommit
  ima = rev-parse HEAD

  # mergeの際にconflictが起きたファイルを編集
  edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; for file in `f`; do $EDITOR $file; done"
  # mergeの際にconflictが起きたファイルをadd
  add-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
  delete-unmerged = "!f() { git ls-files --deleted | cut -f2 | sort -u ; }; git rm `f`"

  sq = "!point=${1:-HEAD} sh -c 'files=`git diff --name-only ${point}`; git reset ${point}; git add $files; git commit -a; git tag -d pt; git tag pt'"

  rept = tag -f pt

  hold = "!sh -c 'git update-ref refs/hold/$1 refs/heads/$1 && \
          git branch -D $1' -"

  delete-remote-branches = "!branches=$* sh -c 'for br in $branches; do git push --no-verify origin :$br; done'"
  addw = !"git diff -w --no-color | git apply --cached"

  delete-merged-branches = !"brs=`git branch --merged master | grep -v master | grep -v '*'` && git branch -D $brs || true"
  delete-remote-merged-branches = "!for br in $(git branch --merged origin/master --remote | grep -v master); do git push --no-verify `echo $br | sed -e 's/\\// :/'` ; done"
  dmb = delete-merged-branches
  psc = -c push.default=current push --set-upstream
  around = "!center=${1} sh -c 'git rev-list --ancestry-path "$center"^^^..master | tail -n5 | xargs git show'"
  first = !"git init && git commit --allow-empty -m \"first commit\""
[help]
  autocorrect = 0
[color]
  ui = true
[grep]
	lineNumbers = true
[url "git@github.com:tomykaira/"]
  insteadof = gh:
[url "git@github.com:"]
  pushinsteadof = "https://github.com/"
  pushinsteadof = "git://github.com/"

[mergetool]
	keepBackup = false
[browse-remote "github.com"]
	top = https://{host}/{path}
	ref = https://{host}/{path}/tree/{short_ref}
	rev = https://{host}/{path}/commit/{commit}
[gui]
	encoding = utf-8
[push]
	default = upstream
[diff]
	algorithm = histogram