gitconfig

.gitconfig

[core]
  editor = vim
[user]
  name = HungYuHei
  email = [email protected]
[alias]
  aa = add .
  st = status
  ss = stash
  sss = stash save
  ssl = stash list
  co = checkout
  cm = commit
  bc = branch -v
  rbc = branch -rv
  rmt = remote
  rmts = remote show
  rs = reset
  rsh = reset HEAD
  mg = merge
  l = log --pretty=format:'%h - %an - %ar : %Cgreen%s' --graph -20
  ll = log --pretty=format:'%h - %an - %ar : %Cgreen%s' --graph
  df = diff
  dfc = diff --cached
  cln = clean -df
[color]
  diff = auto
  status = auto
  branch = auto
  ui = auto
[github]
  user = HungYuHei
  token = [XXXXXXXXXXXX]
[merge]
  keepBackup = false;
  tool = extMerge
[mergetool "extMerge"]
  cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
[mergetool]
  keepTemporaries = false
  trustExitCode = false
  keepBackup = false
;[diff]
  ;external = extDiff
[branch]
  autosetuprebase = always

installtion

Download P4Merge from http://www.perforce.com/product/components/perforce_visual_merge_and_diff_tools
chmod +x  /usr/local/bin/extMerge
chmod +x  /usr/local/bin/extDiff

usr_local_bin_extDiff

#!/bin/sh
[ $# -eq 7 ] && /usr/local/bin/extMerge "$2" "$5"

usr_local_bin_extMerge

#!/bin/sh
/usr/local/p4v/bin/p4merge $*