Skip to content

Instantly share code, notes, and snippets.

@dong

dong/.gitconfig

Forked from pksunkara/config
Created February 7, 2017 07:26
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save dong/8eed72660b3d9960b4e1212e44e46ba1 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save dong/8eed72660b3d9960b4e1212e44e46ba1 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. @pksunkara pksunkara revised this gist Oct 3, 2014. 1 changed file with 8 additions and 3 deletions.
    11 changes: 8 additions & 3 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -9,7 +9,7 @@
    smtpencryption = tls
    smtpserver = smtp.gmail.com
    smtpuser = [email protected]
    smtppass = icjbejkkqtyvuach
    smtppass = password
    smtpserverport = 587
    [web]
    browser = google-chrome
    @@ -50,7 +50,7 @@
    support = support-
    versiontag = v
    [alias]
    a = add .
    a = add --all
    ai = add -i
    #############
    ap = apply
    @@ -85,6 +85,7 @@
    #############
    f = fetch
    fo = fetch origin
    fu = fetch upstream
    #############
    fp = format-patch
    #############
    @@ -151,11 +152,15 @@
    ra = remote add
    rr = remote rm
    rv = remote -v
    rm = remote rename
    rp = remote prune
    rs = remote show
    rao = remote add origin
    rau = remote add upstream
    rso = remote show origin
    rsu = remote show upstream
    rpo = remote prune origin
    rpu = remote prune upstream
    #############
    s = status
    sb = status -s -b
    @@ -194,4 +199,4 @@
    subrepo = !sh -c 'filter-branch --prune-empty --subdirectory-filter $1 master' -
    human = name-rev --name-only --refs=refs/heads/*
    serve = !git daemon --reuseaddr --verbose --base-path=. --export-all ./.git
    snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
    snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
  2. @pksunkara pksunkara revised this gist Apr 3, 2014. 1 changed file with 5 additions and 4 deletions.
    9 changes: 5 additions & 4 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -9,7 +9,7 @@
    smtpencryption = tls
    smtpserver = smtp.gmail.com
    smtpuser = [email protected]
    smtppass = password
    smtppass = icjbejkkqtyvuach
    smtpserverport = 587
    [web]
    browser = google-chrome
    @@ -21,7 +21,7 @@
    [push]
    default = matching
    [color]
    ui = always
    ui = auto
    [color "branch"]
    current = yellow bold
    local = green bold
    @@ -179,7 +179,7 @@
    assume = update-index --assume-unchanged
    unassume = update-index --no-assume-unchanged
    assumed = "!git ls-files -v | grep ^h | cut -c 3-"
    unassumeall = "!git assumed | xargs git update-index --no-assume-unchanged"
    unassumeall = !git assumed | xargs git update-index --no-assume-unchanged
    assumeall = "!git st -s | awk {'print $2'} | xargs git assume"
    #############
    ours = "!f() { git checkout --ours $@ && git add $@; }; f"
    @@ -190,7 +190,8 @@
    #############
    barebranch = !sh -c 'git symbolic-ref HEAD refs/heads/$1 && git rm --cached -r . && git clean -xfd' -
    flat = clone --depth 1
    subrepo = !sh -c 'filter-branch --prune-empty --subdirectory-filter $1 master' -'
    subpull = !git submodule foreach git pull --tags origin master
    subrepo = !sh -c 'filter-branch --prune-empty --subdirectory-filter $1 master' -
    human = name-rev --name-only --refs=refs/heads/*
    serve = !git daemon --reuseaddr --verbose --base-path=. --export-all ./.git
    snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
  3. @pksunkara pksunkara revised this gist Jan 7, 2014. 1 changed file with 46 additions and 38 deletions.
    84 changes: 46 additions & 38 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -43,35 +43,13 @@
    [github]
    user = pkumar
    token = token
    [gitflow "prefix"]
    feature = feature-
    release = release-
    hotfix = hotfix-
    support = support-
    versiontag = v
    [alias]
    s = status
    sb = status -s -b
    #############
    sa = stash apply
    sc = stash clear
    sd = stash drop
    sl = stash list
    sp = stash pop
    ss = stash save
    sw = stash show
    #############
    d = diff
    dc = diff --cached
    dl = difftool
    dlc = difftool --cached
    dk = diff --check
    dp = diff --patience
    dck = diff --cached --check
    #############
    c = commit
    ca = commit -a
    cm = commit -m
    cem = commit --allow-empty -m
    cam = commit -am
    cd = commit --amend
    cad = commit -a --amend
    ced = commit --allow-empty --amend
    #############
    a = add .
    ai = add -i
    #############
    @@ -83,29 +61,51 @@
    amr = am --resolved
    ams = am --skip
    #############
    l = log --oneline
    lg = log --oneline --graph --decorate
    #############
    o = checkout
    ob = checkout -b
    #############
    b = branch
    ba = branch -a
    bd = branch -d
    br = branch -r
    #############
    c = commit
    ca = commit -a
    cm = commit -m
    cem = commit --allow-empty -m
    cam = commit -am
    cd = commit --amend
    cad = commit -a --amend
    ced = commit --allow-empty --amend
    #############
    d = diff
    dc = diff --cached
    dl = difftool
    dlc = difftool --cached
    dk = diff --check
    dp = diff --patience
    dck = diff --cached --check
    #############
    f = fetch
    fo = fetch origin
    #############
    fp = format-patch
    #############
    fk = fsck
    #############
    g = grep -p
    #############
    l = log --oneline
    lg = log --oneline --graph --decorate
    #############
    ls = ls-files
    lsf = "!git ls-files | grep -i"
    #############
    m = merge
    ma = merge --abort
    mc = merge --continue
    ms = merge --skip
    #############
    o = checkout
    ob = checkout -b
    #############
    pr = prune -v
    #############
    ps = push
    @@ -157,13 +157,21 @@
    rso = remote show origin
    rpo = remote prune origin
    #############
    s = status
    sb = status -s -b
    #############
    sa = stash apply
    sc = stash clear
    sd = stash drop
    sl = stash list
    sp = stash pop
    ss = stash save
    sw = stash show
    #############
    w = show
    wp = show -p
    wr = show -p --no-color
    #############
    ls = ls-files
    lsf = "!git ls-files | grep -i"
    #############
    svnr = svn rebase
    svnd = svn dcommit
    svnl = svn log --oneline --show-commit
    @@ -185,4 +193,4 @@
    subrepo = !sh -c 'filter-branch --prune-empty --subdirectory-filter $1 master' -'
    human = name-rev --name-only --refs=refs/heads/*
    serve = !git daemon --reuseaddr --verbose --base-path=. --export-all ./.git
    snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
    snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
  4. @pksunkara pksunkara revised this gist Dec 25, 2013. 1 changed file with 2 additions and 1 deletion.
    3 changes: 2 additions & 1 deletion .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -70,6 +70,7 @@
    cam = commit -am
    cd = commit --amend
    cad = commit -a --amend
    ced = commit --allow-empty --amend
    #############
    a = add .
    ai = add -i
    @@ -184,4 +185,4 @@
    subrepo = !sh -c 'filter-branch --prune-empty --subdirectory-filter $1 master' -'
    human = name-rev --name-only --refs=refs/heads/*
    serve = !git daemon --reuseaddr --verbose --base-path=. --export-all ./.git
    snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
    snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
  5. @pksunkara pksunkara revised this gist Nov 24, 2013. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -148,7 +148,7 @@
    #############
    r = remote
    ra = remote add
    rm = remote rm
    rr = remote rm
    rv = remote -v
    rp = remote prune
    rs = remote show
  6. @pksunkara pksunkara revised this gist Nov 15, 2013. 2 changed files with 1 addition and 5 deletions.
    1 change: 1 addition & 0 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -181,6 +181,7 @@
    #############
    barebranch = !sh -c 'git symbolic-ref HEAD refs/heads/$1 && git rm --cached -r . && git clean -xfd' -
    flat = clone --depth 1
    subrepo = !sh -c 'filter-branch --prune-empty --subdirectory-filter $1 master' -'
    human = name-rev --name-only --refs=refs/heads/*
    serve = !git daemon --reuseaddr --verbose --base-path=. --export-all ./.git
    snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
    5 changes: 0 additions & 5 deletions .gitignore
    View file
    Original file line number Diff line number Diff line change
    @@ -13,11 +13,6 @@
    *.swo
    *~

    # Editor files #
    ################
    *.sublime-workspace
    *.sublime-project

    # Packages #
    ############
    *.7z
  7. @pksunkara pksunkara revised this gist Nov 13, 2013. 1 changed file with 5 additions and 0 deletions.
    5 changes: 5 additions & 0 deletions .gitignore
    View file
    Original file line number Diff line number Diff line change
    @@ -13,6 +13,11 @@
    *.swo
    *~

    # Editor files #
    ################
    *.sublime-workspace
    *.sublime-project

    # Packages #
    ############
    *.7z
  8. @pksunkara pksunkara revised this gist Nov 12, 2013. 1 changed file with 0 additions and 186 deletions.
    186 changes: 0 additions & 186 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -184,189 +184,3 @@
    human = name-rev --name-only --refs=refs/heads/*
    serve = !git daemon --reuseaddr --verbose --base-path=. --export-all ./.git
    snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
    [user]
    name = Pavan Kumar Sunkara
    email = [email protected]
    [core]
    editor = vim
    whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
    excludesfile = ~/.gitignore
    [sendemail]
    smtpencryption = tls
    smtpserver = smtp.gmail.com
    smtpuser = [email protected]
    smtppass = password
    smtpserverport = 587
    [web]
    browser = google-chrome
    [instaweb]
    httpd = apache2 -f
    [rerere]
    enabled = 1
    autoupdate = 1
    [push]
    default = matching
    [color]
    ui = always
    [color "branch"]
    current = yellow bold
    local = green bold
    remote = cyan bold
    [color "diff"]
    meta = yellow bold
    frag = magenta bold
    old = red bold
    new = green bold
    whitespace = red reverse
    [color "status"]
    added = green bold
    changed = yellow bold
    untracked = red bold
    [diff]
    tool = vimdiff
    [difftool]
    prompt = false
    [github]
    user = pkumar
    token = token
    [alias]
    s = status
    sb = status -s -b
    #############
    sa = stash apply
    sc = stash clear
    sd = stash drop
    sl = stash list
    sp = stash pop
    ss = stash save
    sw = stash show
    #############
    d = diff
    dc = diff --cached
    dl = difftool
    dlc = difftool --cached
    dk = diff --check
    dp = diff --patience
    dck = diff --cached --check
    #############
    c = commit
    ca = commit -a
    cm = commit -m
    cem = commit --allow-empty -m
    cam = commit -am
    cd = commit --amend
    cad = commit -a --amend
    #############
    a = add .
    ai = add -i
    #############
    ap = apply
    as = apply --stat
    ac = apply --check
    #############
    ama = am --abort
    amr = am --resolved
    ams = am --skip
    #############
    l = log --oneline
    lg = log --oneline --graph --decorate
    #############
    o = checkout
    ob = checkout -b
    #############
    b = branch
    ba = branch -a
    bd = branch -d
    br = branch -r
    #############
    f = fetch
    fo = fetch origin
    #############
    fp = format-patch
    #############
    fk = fsck
    #############
    m = merge
    ma = merge --abort
    mc = merge --continue
    ms = merge --skip
    #############
    pr = prune -v
    #############
    ps = push
    psf = push -f
    psu = push -u
    pso = push origin
    psao = push --all origin
    psfo = push -f origin
    psuo = push -u origin
    psom = push origin master
    psfom = push -f origin master
    psuom = push -u origin master
    #############
    pl = pull
    plu = pull -u
    plo = pull origin
    plp = pull upstream
    plom = pull origin master
    plpm = pull upstream master
    #############
    pb = pull --rebase
    pbo = pull --rebase origin
    pbp = pull --rebase upstream
    pbom = pull --rebase origin master
    pbpm = pull --rebase upstream master
    #############
    rb = rebase
    rba = rebase --abort
    rbc = rebase --continue
    rbi = rebase --interactive
    rbs = rebase --skip
    #############
    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
    #############
    r = remote
    ra = remote add
    rm = remote rm
    rv = remote -v
    rp = remote prune
    rs = remote show
    rao = remote add origin
    rso = remote show origin
    rpo = remote prune origin
    #############
    w = show
    wp = show -p
    wr = show -p --no-color
    #############
    ls = ls-files
    lsf = "!git ls-files | grep -i"
    #############
    svnr = svn rebase
    svnd = svn dcommit
    svnl = svn log --oneline --show-commit
    #############
    assume = update-index --assume-unchanged
    unassume = update-index --no-assume-unchanged
    assumed = "!git ls-files -v | grep ^h | cut -c 3-"
    unassumeall = "!git assumed | xargs git update-index --no-assume-unchanged"
    assumeall = "!git st -s | awk {'print $2'} | xargs git assume"
    #############
    ours = "!f() { git checkout --ours $@ && git add $@; }; f"
    theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
    #############
    whois = "!sh -c 'git log -i -1 --pretty=\"format:%an <%ae>\n\" --author=\"$1\"' -"
    whatis = show -s --pretty='tformat:%h (%s, %ad)' --date=short
    #############
    barebranch = !sh -c 'git symbolic-ref HEAD refs/heads/$1 && git rm --cached -r . && git clean -xfd' -
    flat = clone --depth 1
    human = name-rev --name-only --refs=refs/heads/*
    serve = !git daemon --reuseaddr --verbose --base-path=. --export-all ./.git
    snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
  9. @pksunkara pksunkara revised this gist Nov 12, 2013. 1 changed file with 189 additions and 1 deletion.
    190 changes: 189 additions & 1 deletion .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -19,7 +19,7 @@
    enabled = 1
    autoupdate = 1
    [push]
    default = simple
    default = matching
    [color]
    ui = always
    [color "branch"]
    @@ -111,6 +111,7 @@
    psf = push -f
    psu = push -u
    pso = push origin
    psao = push --all origin
    psfo = push -f origin
    psuo = push -u origin
    psom = push origin master
    @@ -151,6 +152,7 @@
    rv = remote -v
    rp = remote prune
    rs = remote show
    rao = remote add origin
    rso = remote show origin
    rpo = remote prune origin
    #############
    @@ -182,3 +184,189 @@
    human = name-rev --name-only --refs=refs/heads/*
    serve = !git daemon --reuseaddr --verbose --base-path=. --export-all ./.git
    snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
    [user]
    name = Pavan Kumar Sunkara
    email = [email protected]
    [core]
    editor = vim
    whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
    excludesfile = ~/.gitignore
    [sendemail]
    smtpencryption = tls
    smtpserver = smtp.gmail.com
    smtpuser = [email protected]
    smtppass = password
    smtpserverport = 587
    [web]
    browser = google-chrome
    [instaweb]
    httpd = apache2 -f
    [rerere]
    enabled = 1
    autoupdate = 1
    [push]
    default = matching
    [color]
    ui = always
    [color "branch"]
    current = yellow bold
    local = green bold
    remote = cyan bold
    [color "diff"]
    meta = yellow bold
    frag = magenta bold
    old = red bold
    new = green bold
    whitespace = red reverse
    [color "status"]
    added = green bold
    changed = yellow bold
    untracked = red bold
    [diff]
    tool = vimdiff
    [difftool]
    prompt = false
    [github]
    user = pkumar
    token = token
    [alias]
    s = status
    sb = status -s -b
    #############
    sa = stash apply
    sc = stash clear
    sd = stash drop
    sl = stash list
    sp = stash pop
    ss = stash save
    sw = stash show
    #############
    d = diff
    dc = diff --cached
    dl = difftool
    dlc = difftool --cached
    dk = diff --check
    dp = diff --patience
    dck = diff --cached --check
    #############
    c = commit
    ca = commit -a
    cm = commit -m
    cem = commit --allow-empty -m
    cam = commit -am
    cd = commit --amend
    cad = commit -a --amend
    #############
    a = add .
    ai = add -i
    #############
    ap = apply
    as = apply --stat
    ac = apply --check
    #############
    ama = am --abort
    amr = am --resolved
    ams = am --skip
    #############
    l = log --oneline
    lg = log --oneline --graph --decorate
    #############
    o = checkout
    ob = checkout -b
    #############
    b = branch
    ba = branch -a
    bd = branch -d
    br = branch -r
    #############
    f = fetch
    fo = fetch origin
    #############
    fp = format-patch
    #############
    fk = fsck
    #############
    m = merge
    ma = merge --abort
    mc = merge --continue
    ms = merge --skip
    #############
    pr = prune -v
    #############
    ps = push
    psf = push -f
    psu = push -u
    pso = push origin
    psao = push --all origin
    psfo = push -f origin
    psuo = push -u origin
    psom = push origin master
    psfom = push -f origin master
    psuom = push -u origin master
    #############
    pl = pull
    plu = pull -u
    plo = pull origin
    plp = pull upstream
    plom = pull origin master
    plpm = pull upstream master
    #############
    pb = pull --rebase
    pbo = pull --rebase origin
    pbp = pull --rebase upstream
    pbom = pull --rebase origin master
    pbpm = pull --rebase upstream master
    #############
    rb = rebase
    rba = rebase --abort
    rbc = rebase --continue
    rbi = rebase --interactive
    rbs = rebase --skip
    #############
    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
    #############
    r = remote
    ra = remote add
    rm = remote rm
    rv = remote -v
    rp = remote prune
    rs = remote show
    rao = remote add origin
    rso = remote show origin
    rpo = remote prune origin
    #############
    w = show
    wp = show -p
    wr = show -p --no-color
    #############
    ls = ls-files
    lsf = "!git ls-files | grep -i"
    #############
    svnr = svn rebase
    svnd = svn dcommit
    svnl = svn log --oneline --show-commit
    #############
    assume = update-index --assume-unchanged
    unassume = update-index --no-assume-unchanged
    assumed = "!git ls-files -v | grep ^h | cut -c 3-"
    unassumeall = "!git assumed | xargs git update-index --no-assume-unchanged"
    assumeall = "!git st -s | awk {'print $2'} | xargs git assume"
    #############
    ours = "!f() { git checkout --ours $@ && git add $@; }; f"
    theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
    #############
    whois = "!sh -c 'git log -i -1 --pretty=\"format:%an <%ae>\n\" --author=\"$1\"' -"
    whatis = show -s --pretty='tformat:%h (%s, %ad)' --date=short
    #############
    barebranch = !sh -c 'git symbolic-ref HEAD refs/heads/$1 && git rm --cached -r . && git clean -xfd' -
    flat = clone --depth 1
    human = name-rev --name-only --refs=refs/heads/*
    serve = !git daemon --reuseaddr --verbose --base-path=. --export-all ./.git
    snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
  10. @pksunkara pksunkara revised this gist Nov 11, 2013. 1 changed file with 23 additions and 23 deletions.
    46 changes: 23 additions & 23 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -20,6 +20,29 @@
    autoupdate = 1
    [push]
    default = simple
    [color]
    ui = always
    [color "branch"]
    current = yellow bold
    local = green bold
    remote = cyan bold
    [color "diff"]
    meta = yellow bold
    frag = magenta bold
    old = red bold
    new = green bold
    whitespace = red reverse
    [color "status"]
    added = green bold
    changed = yellow bold
    untracked = red bold
    [diff]
    tool = vimdiff
    [difftool]
    prompt = false
    [github]
    user = pkumar
    token = token
    [alias]
    s = status
    sb = status -s -b
    @@ -159,26 +182,3 @@
    human = name-rev --name-only --refs=refs/heads/*
    serve = !git daemon --reuseaddr --verbose --base-path=. --export-all ./.git
    snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
    [color]
    ui = always
    [color "branch"]
    current = yellow bold
    local = green bold
    remote = cyan bold
    [color "diff"]
    meta = yellow bold
    frag = magenta bold
    old = red bold
    new = green bold
    whitespace = red reverse
    [color "status"]
    added = green bold
    changed = yellow bold
    untracked = red bold
    [diff]
    tool = vimdiff
    [difftool]
    prompt = false
    [github]
    user = pkumar
    token = token
  11. @pksunkara pksunkara revised this gist Nov 11, 2013. 1 changed file with 48 additions and 28 deletions.
    76 changes: 48 additions & 28 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -19,30 +19,7 @@
    enabled = 1
    autoupdate = 1
    [push]
    default = matching
    [color]
    ui = always
    [color "branch"]
    current = yellow bold
    local = green bold
    remote = cyan bold
    [color "diff"]
    meta = yellow bold
    frag = magenta bold
    old = red bold
    new = green bold
    whitespace = red reverse
    [color "status"]
    added = green bold
    changed = yellow bold
    untracked = red bold
    [diff]
    tool = vimdiff
    [difftool]
    prompt = false
    [github]
    user = pkumar
    token = token
    default = simple
    [alias]
    s = status
    sb = status -s -b
    @@ -66,6 +43,7 @@
    c = commit
    ca = commit -a
    cm = commit -m
    cem = commit --allow-empty -m
    cam = commit -am
    cd = commit --amend
    cad = commit -a --amend
    @@ -113,6 +91,8 @@
    psfo = push -f origin
    psuo = push -u origin
    psom = push origin master
    psfom = push -f origin master
    psuom = push -u origin master
    #############
    pl = pull
    plu = pull -u
    @@ -144,7 +124,7 @@
    #############
    r = remote
    ra = remote add
    rr = remote rm
    rm = remote rm
    rv = remote -v
    rp = remote prune
    rs = remote show
    @@ -155,10 +135,50 @@
    wp = show -p
    wr = show -p --no-color
    #############
    ls = ls-files
    lsf = "!git ls-files | grep -i"
    #############
    svnr = svn rebase
    svnd = svn dcommit
    svnl = svn log --oneline --show-commit
    #############
    assume = update-index --assume-unchanged
    unassume = update-index --no-assume-unchanged
    assumed = "!git ls-files -v | grep ^h | cut -c 3-"
    snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
    ours = "!f() { git checkout --ours $@ && git add $@; }; f"
    unassumeall = "!git assumed | xargs git update-index --no-assume-unchanged"
    assumeall = "!git st -s | awk {'print $2'} | xargs git assume"
    #############
    ours = "!f() { git checkout --ours $@ && git add $@; }; f"
    theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
    human = name-rev --name-only --refs=refs/heads/*
    #############
    whois = "!sh -c 'git log -i -1 --pretty=\"format:%an <%ae>\n\" --author=\"$1\"' -"
    whatis = show -s --pretty='tformat:%h (%s, %ad)' --date=short
    #############
    barebranch = !sh -c 'git symbolic-ref HEAD refs/heads/$1 && git rm --cached -r . && git clean -xfd' -
    flat = clone --depth 1
    human = name-rev --name-only --refs=refs/heads/*
    serve = !git daemon --reuseaddr --verbose --base-path=. --export-all ./.git
    snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
    [color]
    ui = always
    [color "branch"]
    current = yellow bold
    local = green bold
    remote = cyan bold
    [color "diff"]
    meta = yellow bold
    frag = magenta bold
    old = red bold
    new = green bold
    whitespace = red reverse
    [color "status"]
    added = green bold
    changed = yellow bold
    untracked = red bold
    [diff]
    tool = vimdiff
    [difftool]
    prompt = false
    [github]
    user = pkumar
    token = token
  12. @pksunkara pksunkara revised this gist Nov 9, 2013. 1 changed file with 26 additions and 24 deletions.
    50 changes: 26 additions & 24 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -18,6 +18,31 @@
    [rerere]
    enabled = 1
    autoupdate = 1
    [push]
    default = matching
    [color]
    ui = always
    [color "branch"]
    current = yellow bold
    local = green bold
    remote = cyan bold
    [color "diff"]
    meta = yellow bold
    frag = magenta bold
    old = red bold
    new = green bold
    whitespace = red reverse
    [color "status"]
    added = green bold
    changed = yellow bold
    untracked = red bold
    [diff]
    tool = vimdiff
    [difftool]
    prompt = false
    [github]
    user = pkumar
    token = token
    [alias]
    s = status
    sb = status -s -b
    @@ -136,27 +161,4 @@
    snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
    ours = "!f() { git checkout --ours $@ && git add $@; }; f"
    theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
    human = name-rev --name-only --refs=refs/heads/*
    [color]
    ui = always
    [color "branch"]
    current = yellow bold
    local = green bold
    remote = cyan bold
    [color "diff"]
    meta = yellow bold
    frag = magenta bold
    old = red bold
    new = green bold
    whitespace = red reverse
    [color "status"]
    added = green bold
    changed = yellow bold
    untracked = red bold
    [diff]
    tool = vimdiff
    [difftool]
    prompt = false
    [github]
    user = pkumar
    token = token
    human = name-rev --name-only --refs=refs/heads/*
  13. @pksunkara pksunkara revised this gist Oct 22, 2013. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -119,7 +119,7 @@
    #############
    r = remote
    ra = remote add
    rm = remote rm
    rr = remote rm
    rv = remote -v
    rp = remote prune
    rs = remote show
  14. @pksunkara pksunkara revised this gist Apr 8, 2013. 1 changed file with 10 additions and 1 deletion.
    11 changes: 10 additions & 1 deletion .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -35,6 +35,7 @@
    dl = difftool
    dlc = difftool --cached
    dk = diff --check
    dp = diff --patience
    dck = diff --cached --check
    #############
    c = commit
    @@ -84,6 +85,8 @@
    psf = push -f
    psu = push -u
    pso = push origin
    psfo = push -f origin
    psuo = push -u origin
    psom = push origin master
    #############
    pl = pull
    @@ -127,6 +130,12 @@
    wp = show -p
    wr = show -p --no-color
    #############
    assume = update-index --assume-unchanged
    unassume = update-index --no-assume-unchanged
    assumed = "!git ls-files -v | grep ^h | cut -c 3-"
    snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
    ours = "!f() { git checkout --ours $@ && git add $@; }; f"
    theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
    human = name-rev --name-only --refs=refs/heads/*
    [color]
    ui = always
    @@ -150,4 +159,4 @@
    prompt = false
    [github]
    user = pkumar
    token = token
    token = token
  15. @pksunkara pksunkara revised this gist Jul 25, 2012. 3 changed files with 30 additions and 15 deletions.
    38 changes: 29 additions & 9 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -28,9 +28,12 @@
    sl = stash list
    sp = stash pop
    ss = stash save
    sw = stash show
    #############
    d = diff
    dc = diff --cached
    dl = difftool
    dlc = difftool --cached
    dk = diff --check
    dck = diff --cached --check
    #############
    @@ -42,11 +45,16 @@
    cad = commit -a --amend
    #############
    a = add .
    ai = add -i
    #############
    ap = apply
    as = apply --stat
    ac = apply --check
    #############
    ama = am --abort
    amr = am --resolved
    ams = am --skip
    #############
    l = log --oneline
    lg = log --oneline --graph --decorate
    #############
    @@ -66,21 +74,30 @@
    fk = fsck
    #############
    m = merge
    ma = merge --abort
    mc = merge --continue
    ms = merge --skip
    #############
    pr = prune -v
    #############
    ps = push
    pl = pull
    pb = pull --rebase
    psf = push -f
    psu = push -u
    plu = pull -u
    pso = push origin
    psom = push origin master
    #############
    pl = pull
    plu = pull -u
    plo = pull origin
    plp = pull upstream
    plom = pull origin master
    plpm = pull upstream master
    #############
    pb = pull --rebase
    pbo = pull --rebase origin
    psfo = push -f origin
    psuo = push -u origin
    pluo = pull -u origin
    pbp = pull --rebase upstream
    pbom = pull --rebase origin master
    pbpm = pull --rebase upstream master
    #############
    rb = rebase
    rba = rebase --abort
    @@ -107,9 +124,8 @@
    rpo = remote prune origin
    #############
    w = show
    #############
    meldon = config diff.external /home/pkumar/.meld.py
    meldof = config --remove-section diff
    wp = show -p
    wr = show -p --no-color
    #############
    human = name-rev --name-only --refs=refs/heads/*
    [color]
    @@ -128,6 +144,10 @@
    added = green bold
    changed = yellow bold
    untracked = red bold
    [diff]
    tool = vimdiff
    [difftool]
    prompt = false
    [github]
    user = pkumar
    token = token
    1 change: 1 addition & 0 deletions .gitignore
    View file
    Original file line number Diff line number Diff line change
    @@ -10,6 +10,7 @@
    # Temporary files #
    ###################
    *.swp
    *.swo
    *~

    # Packages #
    6 changes: 0 additions & 6 deletions .meld.py
    View file
    Original file line number Diff line number Diff line change
    @@ -1,6 +0,0 @@
    #!/usr/bin/python

    import sys
    import os

    os.system('meld "%s" "%s"' % (sys.argv[2], sys.argv[5]))
  16. @pksunkara pksunkara revised this gist Mar 20, 2012. 2 changed files with 46 additions and 3 deletions.
    12 changes: 9 additions & 3 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -4,15 +4,17 @@
    [core]
    editor = vim
    whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
    excludesfile = ~/.gitignore
    [sendemail]
    smtpencryption = tls
    smtpserver = smtp.gmail.com
    smtpuser = [email protected]
    smtppass = password
    smtpserverport = 587
    to = [email protected]
    [web]
    browser = google-chrome
    [instaweb]
    httpd = apache2 -f
    [rerere]
    enabled = 1
    autoupdate = 1
    @@ -81,6 +83,10 @@
    pluo = pull -u origin
    #############
    rb = rebase
    rba = rebase --abort
    rbc = rebase --continue
    rbi = rebase --interactive
    rbs = rebase --skip
    #############
    re = reset
    rh = reset HEAD
    @@ -107,7 +113,7 @@
    #############
    human = name-rev --name-only --refs=refs/heads/*
    [color]
    ui = true
    ui = always
    [color "branch"]
    current = yellow bold
    local = green bold
    @@ -124,4 +130,4 @@
    untracked = red bold
    [github]
    user = pkumar
    token = token
    token = token
    37 changes: 37 additions & 0 deletions .gitignore
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,37 @@
    # Compiled source #
    ###################
    *.com
    *.class
    *.dll
    *.exe
    *.o
    *.so

    # Temporary files #
    ###################
    *.swp
    *~

    # Packages #
    ############
    *.7z
    *.dmg
    *.gz
    *.iso
    *.jar
    *.rar
    *.tar
    *.zip

    # Logs and databases #
    ######################
    *.log
    *.sql
    *.sqlite

    # OS generated files #
    ######################
    .DS_Store*
    ehthumbs.db
    Icon?
    Thumbs.db
  17. @pksunkara pksunkara revised this gist Aug 27, 2011. 2 changed files with 33 additions and 4 deletions.
    37 changes: 33 additions & 4 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -19,66 +19,92 @@
    [alias]
    s = status
    sb = status -s -b
    #############
    sa = stash apply
    sc = stash clear
    sd = stash drop
    sl = stash list
    sp = stash pop
    ss = stash save
    #############
    d = diff
    dc = diff --cached
    dk = diff --check
    dck = diff --cached --check
    #############
    c = commit
    ca = commit -a
    cm = commit -m
    cam = commit -am
    cd = commit --amend
    cad = commit -a --amend
    #############
    a = add .
    #############
    ap = apply
    as = apply --stat
    ac = apply --check
    #############
    l = log --oneline
    lg = log --oneline --graph --decorate
    #############
    o = checkout
    ob = checkout -b
    #############
    b = branch
    ba = branch -a
    bd = branch -d
    br = branch -r
    #############
    f = fetch
    fo = fetch origin
    #############
    fp = format-patch
    #############
    fk = fsck
    #############
    m = merge
    #############
    pr = prune -v
    #############
    ps = push
    pl = pull
    pb = pull --rebase
    pr = prune -v
    psf = push -f
    psu = push -u
    plu = pull -u
    pso = push origin
    plo = pull origin
    pbo = pull --rebase origin
    psfo = push -f origin
    psuo = push -u origin
    r = remote
    pluo = pull -u origin
    #############
    rb = rebase
    #############
    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
    #############
    r = remote
    ra = remote add
    rm = remote rm
    rv = remote -v
    rp = remote prune
    rs = remote show
    rso = remote show origin
    rpo = remote prune origin
    #############
    w = show
    meldon = config diff.external /home/pkumar/.diff.py
    #############
    meldon = config diff.external /home/pkumar/.meld.py
    meldof = config --remove-section diff
    #############
    human = name-rev --name-only --refs=refs/heads/*
    [color]
    ui = true
    @@ -95,4 +121,7 @@
    [color "status"]
    added = green bold
    changed = yellow bold
    untracked = red bold
    untracked = red bold
    [github]
    user = pkumar
    token = token
    0 .diff.py → .meld.py
    View file
    File renamed without changes.
  18. @pksunkara pksunkara revised this gist Jul 16, 2011. 1 changed file with 5 additions and 1 deletion.
    6 changes: 5 additions & 1 deletion .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -13,8 +13,12 @@
    to = [email protected]
    [web]
    browser = google-chrome
    [rerere]
    enabled = 1
    autoupdate = 1
    [alias]
    s = status
    sb = status -s -b
    sa = stash apply
    sc = stash clear
    sd = stash drop
    @@ -36,7 +40,7 @@
    as = apply --stat
    ac = apply --check
    l = log --oneline
    lg = log --oneline --graph
    lg = log --oneline --graph --decorate
    o = checkout
    ob = checkout -b
    b = branch
  19. @pksunkara pksunkara revised this gist Jul 16, 2011. 1 changed file with 1 addition and 0 deletions.
    1 change: 1 addition & 0 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -75,6 +75,7 @@
    w = show
    meldon = config diff.external /home/pkumar/.diff.py
    meldof = config --remove-section diff
    human = name-rev --name-only --refs=refs/heads/*
    [color]
    ui = true
    [color "branch"]
  20. @pksunkara pksunkara revised this gist Jul 16, 2011. 1 changed file with 2 additions and 0 deletions.
    2 changes: 2 additions & 0 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -11,6 +11,8 @@
    smtppass = password
    smtpserverport = 587
    to = [email protected]
    [web]
    browser = google-chrome
    [alias]
    s = status
    sa = stash apply
  21. @pksunkara pksunkara renamed this gist Jul 16, 2011. 1 changed file with 9 additions and 1 deletion.
    10 changes: 9 additions & 1 deletion gitconfig → .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -4,6 +4,13 @@
    [core]
    editor = vim
    whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
    [sendemail]
    smtpencryption = tls
    smtpserver = smtp.gmail.com
    smtpuser = [email protected]
    smtppass = password
    smtpserverport = 587
    to = [email protected]
    [alias]
    s = status
    sa = stash apply
    @@ -47,7 +54,8 @@
    pso = push origin
    plo = pull origin
    pbo = pull --rebase origin
    psof = push origin -f
    psfo = push -f origin
    psuo = push -u origin
    r = remote
    rb = rebase
    re = reset
  22. @pksunkara pksunkara renamed this gist Jul 7, 2011. 1 changed file with 7 additions and 0 deletions.
    7 changes: 7 additions & 0 deletions .gitconfig → gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -51,6 +51,13 @@
    r = remote
    rb = rebase
    re = reset
    reh = reset --hard
    rem = reset --mixed
    res = reset --soft
    rehh = reset --hard HEAD
    remh = reset --mixed HEAD
    resh = reset --soft HEAD
    rv = remote -v
    rp = remote prune
    rs = remote show
    rso = remote show origin
  23. @pksunkara pksunkara renamed this gist Jul 2, 2011. 1 changed file with 5 additions and 0 deletions.
    5 changes: 5 additions & 0 deletions gitconfig → .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -29,8 +29,10 @@
    l = log --oneline
    lg = log --oneline --graph
    o = checkout
    ob = checkout -b
    b = branch
    ba = branch -a
    bd = branch -d
    br = branch -r
    f = fetch
    fp = format-patch
    @@ -40,9 +42,12 @@
    pl = pull
    pb = pull --rebase
    pr = prune -v
    psf = push -f
    psu = push -u
    pso = push origin
    plo = pull origin
    pbo = pull --rebase origin
    psof = push origin -f
    r = remote
    rb = rebase
    re = reset
  24. @pksunkara pksunkara revised this gist Jun 23, 2011. 1 changed file with 14 additions and 6 deletions.
    20 changes: 14 additions & 6 deletions gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -6,13 +6,12 @@
    whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
    [alias]
    s = status
    sh = show
    ss = stash save
    sl = stash list
    sp = stash pop
    sd = stash drop
    sa = stash apply
    sc = stash clear
    sd = stash drop
    sl = stash list
    sp = stash pop
    ss = stash save
    d = diff
    dc = diff --cached
    dk = diff --check
    @@ -31,6 +30,8 @@
    lg = log --oneline --graph
    o = checkout
    b = branch
    ba = branch -a
    br = branch -r
    f = fetch
    fp = format-patch
    fk = fsck
    @@ -39,10 +40,17 @@
    pl = pull
    pb = pull --rebase
    pr = prune -v
    pso = push origin
    plo = pull origin
    pbo = pull --rebase origin
    r = remote
    rb = rebase
    rp = remote --prune
    re = reset
    rp = remote prune
    rs = remote show
    rso = remote show origin
    rpo = remote prune origin
    w = show
    meldon = config diff.external /home/pkumar/.diff.py
    meldof = config --remove-section diff
    [color]
  25. @pksunkara pksunkara revised this gist Jun 10, 2011. 1 changed file with 7 additions and 6 deletions.
    13 changes: 7 additions & 6 deletions gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -7,6 +7,12 @@
    [alias]
    s = status
    sh = show
    ss = stash save
    sl = stash list
    sp = stash pop
    sd = stash drop
    sa = stash apply
    sc = stash clear
    d = diff
    dc = diff --cached
    dk = diff --check
    @@ -36,12 +42,7 @@
    r = remote
    rb = rebase
    rp = remote --prune
    ss = stash save
    sl = stash list
    sp = stash pop
    sd = stash drop
    sa = stash apply
    sc = stash clear
    rs = remote show
    meldon = config diff.external /home/pkumar/.diff.py
    meldof = config --remove-section diff
    [color]
  26. @pksunkara pksunkara revised this gist Jun 10, 2011. 1 changed file with 6 additions and 0 deletions.
    6 changes: 6 additions & 0 deletions gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -9,18 +9,24 @@
    sh = show
    d = diff
    dc = diff --cached
    dk = diff --check
    dck = diff --cached --check
    c = commit
    ca = commit -a
    cm = commit -m
    cam = commit -am
    cd = commit --amend
    cad = commit -a --amend
    a = add .
    ap = apply
    as = apply --stat
    ac = apply --check
    l = log --oneline
    lg = log --oneline --graph
    o = checkout
    b = branch
    f = fetch
    fp = format-patch
    fk = fsck
    m = merge
    ps = push
  27. @pksunkara pksunkara revised this gist Jun 10, 2011. 2 changed files with 18 additions and 2 deletions.
    6 changes: 6 additions & 0 deletions .diff.py
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,6 @@
    #!/usr/bin/python

    import sys
    import os

    os.system('meld "%s" "%s"' % (sys.argv[2], sys.argv[5]))
    14 changes: 12 additions & 2 deletions gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -1,25 +1,35 @@
    [user]
    name = Pavan Kumar Sunkara
    email = pavan@chronus.com
    email = pavan.sss1991@gmail.com
    [core]
    editor = vim
    whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
    [alias]
    s = status
    sh = show
    d = diff
    dc = diff --cached
    c = commit
    ca = commit -a
    cm = commit -m
    cam = commit -am
    cd = commit --amend
    cad = commit -a --amend
    a = add .
    l = log --oneline
    lg = log --oneline --graph
    o = checkout
    b = branch
    f = fetch
    fk = fsck
    m = merge
    ps = push
    pl = pull
    pb = pull --rebase
    pr = prune -v
    r = remote
    rb = rebase
    rp = remote --prune
    ss = stash save
    sl = stash list
    sp = stash pop
    @@ -43,4 +53,4 @@
    [color "status"]
    added = green bold
    changed = yellow bold
    untracked = red bold
    untracked = red bold
  28. @pksunkara pksunkara revised this gist Jun 2, 2011. 1 changed file with 4 additions and 2 deletions.
    6 changes: 4 additions & 2 deletions gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -1,6 +1,6 @@
    [user]
    name = Pavan Kumar Sunkara
    email = pavan.sss1991@gmail.com
    email = pavan@chronus.com
    [core]
    editor = vim
    whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
    @@ -26,6 +26,8 @@
    sd = stash drop
    sa = stash apply
    sc = stash clear
    meldon = config diff.external /home/pkumar/.diff.py
    meldof = config --remove-section diff
    [color]
    ui = true
    [color "branch"]
    @@ -41,4 +43,4 @@
    [color "status"]
    added = green bold
    changed = yellow bold
    untracked = red bold
    untracked = red bold
  29. @pksunkara pksunkara revised this gist May 24, 2011. 1 changed file with 3 additions and 2 deletions.
    5 changes: 3 additions & 2 deletions gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -14,10 +14,11 @@
    lg = log --oneline --graph
    o = checkout
    b = branch
    f = fsck
    f = fetch
    fk = fsck
    ps = push
    pl = pull
    pr = prune
    pr = prune -v
    r = remote
    ss = stash save
    sl = stash list
  30. @pksunkara pksunkara revised this gist May 24, 2011. 1 changed file with 8 additions and 6 deletions.
    14 changes: 8 additions & 6 deletions gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -23,19 +23,21 @@
    sl = stash list
    sp = stash pop
    sd = stash drop
    sa = stash apply
    sc = stash clear
    [color]
    ui = true
    [color "branch"]
    current = yellow
    local = green
    remote = cyan
    current = yellow bold
    local = green bold
    remote = cyan bold
    [color "diff"]
    meta = yellow bold
    frag = magenta bold
    old = red bold
    new = green bold
    whitespace = red reverse
    [color "status"]
    added = green
    changed = yellow
    untracked = red
    added = green bold
    changed = yellow bold
    untracked = red bold