gitconfig

gitconfig

[user]
	name = Nitheesh K L
	email = nitheeshkl@gmail.com

# color {{{
[color]
    branch = auto
    diff = auto
    status = auto
    ui = true
[color "diff"]
    plain = normal
    meta = bold
    frag = cyan
    old = red
    new = green
    commit = yellow
    whitespace = normal red
[color "branch"]
    current = green
    local = normal
    remote = red
    plain = normal
[color "status"]
    header = normal
    added = red
    updated = green
    changed = red
    untracked = red
    nobranch = red
[color "grep"]
    match = normal
[color "interactive"]
    prompt = normal
    header = normal
    help = normal
    error = normal
# }}}

# push/pull/diff/options {{{
[push]
    default = tracking
[pull]
    default = current
[diff]
  memonicprefix = true
[branch]
  autosetuprebase = always
[apply]
  whitespace = nowarn
#}}}

# difftools {{{
[difftool "sourcetree"]
	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
	path = 
[mergetool "sourcetree"]
	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
	trustExitCode = true
# }}}

# alias {{{
[alias]
    st = status 

    cl = clone

    ci = commit
    cm = commit -m
    cma = commit -a -m
    ca = commit --amend
    amend = commit --amend
    caa = commit -a --amend -C HEAD
    filelog = log -u
    fl = log -u

    ai = add --interactive

    md = diff origin/master.. #diff between your branch and the remote master
    mdl = log origin/master.. #commit diff between your local branch and remote master
    mdn = diff --name-status origin/master.. #list files that are changed compared with remote master
    alias = config --get-regexp alias   #list what aliases you have

    co = checkout
    b = branch 
    #"!git branch -ra | grep -v done"
    ba = branch -ra
    #list commands
    logp = log --pretty=format:"%h%x09%an%x09%ad%x09%s"
    logtree = log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
    le = log --oneline --decorate
    ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
    ls1 = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
    lds = log --pretty=format:"%C(yellow)%h\\ %C(green)%ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short --graph
    ls = log --pretty=format:"%C(green)%h\\ %C(yellow)[%ad]%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
    lc  = "!f() { git ll "$1"^.."$1"; }; f"
    lnc = log --pretty=format:"%h\\ %s\\ [%cn]"
    #list all aliases
    la = "!git config -l | grep alias | cut -c 7-"
    diff = diff --word-diff
    d = diff --word-diff
    dc = diff --cached
    #list modified files in last commit
    dl = "!git ll -1"
    #diff last commit
    dlc = diff --cached HEAD^
    dr  = "!f() { git diff "$1"^.."$1"; }; f"
    diffr  = "!f() { git diff "$1"^.."$1"; }; f"
    branch = branch -ra

    #reset commands
    r = reset
    r1 = reset HEAD^
    r2 = reset HEAD^^
    rh = reset --hard
    rh1 = reset HEAD^ --hard
    rh2 = reset HEAD^^ --hard

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

    #stash
    sl = stash list
    sa = stash apply
    ss = stash save

    cp = cherry-pick
    grep = grep -Ii
    gr = grep -Ii
    #grep from root folder
    gra = "!f() { A=$(pwd) && TOPLEVEL=$(git rev-parse --show-toplevel) && cd $TOPLEVEL && git grep --full-name -In $1 | xargs -I{} echo $TOPLEVEL/{} && cd $A; }; f"

    #grep on filename
    f = "!git ls-files | grep -i"

    #rename branch tree to done-
    done = "!f() { git branch | grep "$1" | cut -c 3- | grep -v done | xargs -I{} git branch -m {} done-{}; }; f"

    #assume aliases
    assume = update-index --assume-unchanged
    unassume = update-index --no-assume-unchanged
    #show assumed files
    assumed = "!git ls-files -v | grep ^h | cut -c 3-"
    #unassume all the assumed files
    unassumeall = "!git assumed | xargs git update-index --no-assume-unchanged"
    assumeall = "!git st -s | awk {'print $2'} | xargs git assume"

    lasttag = describe --tags --abbrev=0
    lt = describe --tags --abbrev=0

    #merges
    ours = "!f() { git co --ours $@ && git add $@; }; f"
    theirs = "!f() { git co --theirs $@ && git add $@; }; f"
# }}}
[core]
    excludesfile = /home/nkl1/.gitignore
#    gitproxy=git-proxy
#    gitproxy=http-proxy-gw
#    autocrlf = input

[review "aia-review.intel.com"]
        username = nkl1

[url "ssh://nkl1@android-mirror-or.devtools.intel.com:29418/"]
insteadOf=git://android.intel.com/
insteadOf=ssh://android.intel.com/
insteadOf=ssh://android.intel.com:29418/
insteadOf=git://android-mirror-or.devtools.intel.com/
insteadOf=ssh://android-mirror-or.devtools.intel.com/
insteadOf=ssh://android-mirror-or.devtools.intel.com:29418/
insteadOf=git://android-mirror.devtools.intel.com/
insteadOf=ssh://android-mirror.devtools.intel.com/
insteadOf=ssh://android-mirror.devtools.intel.com:29418/
insteadOf=git://jfumg-gcrmirror.jf.intel.com/
insteadOf=ssh://jfumg-gcrmirror.jf.intel.com/

[url "ssh://nkl1@android.intel.com:29418/"]
pushInsteadOf=ssh://android.intel.com/
pushInsteadOf=ssh://android.intel.com:29418/
pushInsteadOf=ssh://jfumg-gcrmirror.jf.intel.com/
pushInsteadOf=ssh://jfumg-gcrmirror.jf.intel.com:29418/
pushInsteadOf=ssh://android-mirror.devtools.intel.com/
pushInsteadOf=ssh://android-mirror.devtools.intel.com:29418/
pushInsteadOf=ssh://android-mirror-or.devtools.intel.com/
pushInsteadOf=ssh://android-mirror-or.devtools.intel.com:29418/

# }}}
[credential]
	helper = store
#[http]
#    sslVerify = true
#[httpd]
#    sslVersion = sslv3
[http]
    #proxy = http://proxy.iind.intel.com:911
[https]
    #proxy = https://proxy.iind.intel.com:911