Skip to content

Instantly share code, notes, and snippets.

@mshahomar

mshahomar/config

Forked from pksunkara/config
Created January 29, 2023 10:13
Show Gist options
  • Save mshahomar/240b2703e26b2383e4f6e11ddfb9b188 to your computer and use it in GitHub Desktop.
Save mshahomar/240b2703e26b2383e4f6e11ddfb9b188 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. @pksunkara pksunkara revised this gist Feb 11, 2022. 1 changed file with 2 additions and 0 deletions.
    2 changes: 2 additions & 0 deletions config
    View file
    Original file line number Diff line number Diff line change
    @@ -2,6 +2,8 @@
    name = Pavan Kumar Sunkara
    email = [email protected]
    username = pksunkara
    [init]
    defaultBranch = master
    [core]
    editor = nvim
    whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
  2. @pksunkara pksunkara revised this gist Nov 24, 2021. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion config
    View file
    Original file line number Diff line number Diff line change
    @@ -3,7 +3,7 @@
    email = [email protected]
    username = pksunkara
    [core]
    editor = vim
    editor = nvim
    whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
    pager = delta
    [sendemail]
  3. @pksunkara pksunkara revised this gist Oct 30, 2021. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion config
    View file
    Original file line number Diff line number Diff line change
    @@ -237,7 +237,7 @@
    subadd = !sh -c 'git submodule add git://github.com/$1 $2/$(basename $1)' -
    subrm = !sh -c 'git submodule deinit -f -- $1 && rm -rf .git/modules/$1 && git rm -f $1' -
    subup = submodule update --init --recursive
    subpull = !git submodule foreach git pull --tags origin master
    subpull = !git submodule foreach git pull --tags -f origin master
    #############
    assume = update-index --assume-unchanged
    unassume = update-index --no-assume-unchanged
  4. @pksunkara pksunkara revised this gist Aug 11, 2021. 1 changed file with 0 additions and 2 deletions.
    2 changes: 0 additions & 2 deletions config
    View file
    Original file line number Diff line number Diff line change
    @@ -19,8 +19,6 @@
    [rerere]
    enabled = 1
    autoupdate = 1
    [push]
    default = matching
    [color]
    ui = auto
    [color "branch"]
  5. @pksunkara pksunkara revised this gist Apr 22, 2021. 1 changed file with 3 additions and 1 deletion.
    4 changes: 3 additions & 1 deletion ignore
    View file
    Original file line number Diff line number Diff line change
    @@ -35,4 +35,6 @@ ehthumbs.db
    Icon?
    Thumbs.db

    *.lock
    # Editor files #
    ################
    .vscode
  6. @pksunkara pksunkara revised this gist Sep 9, 2020. 2 changed files with 0 additions and 1 deletion.
    1 change: 0 additions & 1 deletion .gitconfig → config
    View file
    Original file line number Diff line number Diff line change
    @@ -5,7 +5,6 @@
    [core]
    editor = vim
    whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
    excludesfile = ~/.gitignore
    pager = delta
    [sendemail]
    smtpencryption = tls
    0 .gitignore → ignore
    View file
    File renamed without changes.
  7. @pksunkara pksunkara revised this gist Sep 7, 2020. 1 changed file with 19 additions and 1 deletion.
    20 changes: 19 additions & 1 deletion .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -6,6 +6,7 @@
    editor = vim
    whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
    excludesfile = ~/.gitignore
    pager = delta
    [sendemail]
    smtpencryption = tls
    smtpserver = smtp.gmail.com
    @@ -41,6 +42,23 @@
    tool = vimdiff
    [difftool]
    prompt = false
    [delta]
    features = line-numbers decorations
    line-numbers = true
    [delta "decorations"]
    minus-style = red bold normal
    plus-style = green bold normal
    minus-emph-style = white bold red
    minus-non-emph-style = red bold normal
    plus-emph-style = white bold green
    plus-non-emph-style = green bold normal
    file-style = yellow bold none
    file-decoration-style = yellow box
    hunk-header-style = magenta bold
    hunk-header-decoration-style = magenta box
    minus-empty-line-marker-style = normal normal
    plus-empty-line-marker-style = normal normal
    line-numbers-right-format = "{np:^4}│ "
    [github]
    user = pksunkara
    token = token
    @@ -251,4 +269,4 @@
    clean = git-lfs clean -- %f
    smudge = git-lfs smudge -- %f
    process = git-lfs filter-process
    required = true
    required = true
  8. @pksunkara pksunkara revised this gist Feb 10, 2020. 1 changed file with 1 addition and 4 deletions.
    5 changes: 1 addition & 4 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -45,10 +45,6 @@
    user = pksunkara
    token = token
    [gitflow "prefix"]
    feature = feature-
    release = release-
    hotfix = hotfix-
    support = support-
    versiontag = v
    [sequence]
    editor = interactive-rebase-tool
    @@ -224,6 +220,7 @@
    svnl = svn log --oneline --show-commit
    #############
    subadd = !sh -c 'git submodule add git://github.com/$1 $2/$(basename $1)' -
    subrm = !sh -c 'git submodule deinit -f -- $1 && rm -rf .git/modules/$1 && git rm -f $1' -
    subup = submodule update --init --recursive
    subpull = !git submodule foreach git pull --tags origin master
    #############
  9. @pksunkara pksunkara revised this gist Jan 19, 2020. 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
    @@ -124,6 +124,7 @@
    o = checkout
    om = checkout master
    ob = checkout -b
    opr = !sh -c 'git fo pull/$1/head:pr-$1 && git o pr-$1'
    #############
    pr = prune -v
    #############
    @@ -250,7 +251,7 @@
    subrepo = !sh -c 'git filter-branch --prune-empty --subdirectory-filter $1 master' -
    human = name-rev --name-only --refs=refs/heads/*
    [filter "lfs"]
    clean = git-lfs clean -- %f
    smudge = git-lfs smudge -- %f
    process = git-lfs filter-process
    required = true
    clean = git-lfs clean -- %f
    smudge = git-lfs smudge -- %f
    process = git-lfs filter-process
    required = true
  10. @pksunkara pksunkara revised this gist Jul 13, 2019. 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
    @@ -85,7 +85,7 @@
    cl = clone
    cld = clone --depth 1
    clg = !sh -c 'git clone git://github.com/$1 $(basename $1)' -
    clgp = !sh -c 'git clone [email protected]/$1 $(basename $1)' -
    clgp = !sh -c 'git clone [email protected]:$1 $(basename $1)' -
    clgu = !sh -c 'git clone [email protected]:$(git config --get user.username)/$1 $1' -
    #############
    cp = cherry-pick
  11. @pksunkara pksunkara revised this gist Jul 12, 2019. 1 changed file with 5 additions and 0 deletions.
    5 changes: 5 additions & 0 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -249,3 +249,8 @@
    theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
    subrepo = !sh -c 'git filter-branch --prune-empty --subdirectory-filter $1 master' -
    human = name-rev --name-only --refs=refs/heads/*
    [filter "lfs"]
    clean = git-lfs clean -- %f
    smudge = git-lfs smudge -- %f
    process = git-lfs filter-process
    required = true
  12. @pksunkara pksunkara revised this gist Jul 11, 2019. 1 changed file with 3 additions and 1 deletion.
    4 changes: 3 additions & 1 deletion .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -85,7 +85,8 @@
    cl = clone
    cld = clone --depth 1
    clg = !sh -c 'git clone git://github.com/$1 $(basename $1)' -
    clgp = !sh -c 'git clone [email protected]:$(git config --get user.username)/$1 $1' -
    clgp = !sh -c 'git clone [email protected]/$1 $(basename $1)' -
    clgu = !sh -c 'git clone [email protected]:$(git config --get user.username)/$1 $1' -
    #############
    cp = cherry-pick
    cpa = cherry-pick --abort
    @@ -176,6 +177,7 @@
    rehh = reset --hard HEAD
    remh = reset --mixed HEAD
    resh = reset --soft HEAD
    rehom = reset --hard origin/master
    #############
    r = remote
    ra = remote add
  13. @pksunkara pksunkara revised this gist Jul 9, 2019. 2 changed files with 2 additions and 3 deletions.
    1 change: 1 addition & 0 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -71,6 +71,7 @@
    br = branch -r
    bc = rev-parse --abbrev-ref HEAD
    bu = !git rev-parse --abbrev-ref --symbolic-full-name "@{u}"
    bs = !git-branch-status
    #############
    c = commit
    ca = commit -a
    4 changes: 1 addition & 3 deletions .gitignore
    View file
    Original file line number Diff line number Diff line change
    @@ -24,11 +24,9 @@
    *.tar
    *.zip

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

    # OS generated files #
    ######################
  14. @pksunkara pksunkara revised this gist Feb 21, 2019. 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
    @@ -50,6 +50,8 @@
    hotfix = hotfix-
    support = support-
    versiontag = v
    [sequence]
    editor = interactive-rebase-tool
    [alias]
    a = add --all
    ai = add -i
  15. @pksunkara pksunkara revised this gist Feb 8, 2019. 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
    @@ -42,7 +42,7 @@
    [difftool]
    prompt = false
    [github]
    user = pkumar
    user = pksunkara
    token = token
    [gitflow "prefix"]
    feature = feature-
    @@ -118,6 +118,7 @@
    ms = merge --skip
    #############
    o = checkout
    om = checkout master
    ob = checkout -b
    #############
    pr = prune -v
  16. @pksunkara pksunkara revised this gist Sep 19, 2018. 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
    @@ -201,6 +201,7 @@
    sl = stash list
    sp = stash pop
    ss = stash save
    ssk = stash save -k
    sw = stash show
    st = !git stash list | wc -l 2>/dev/null | grep -oEi '[0-9][0-9]*'
    #############
  17. @pksunkara pksunkara revised this gist Sep 7, 2018. 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
    @@ -228,6 +228,7 @@
    bump = !sh -c 'git commit -am \"Version bump v$1\" && git psuoc && git release $1' -
    release = !sh -c 'git tag v$1 && git pst' -
    unrelease = !sh -c 'git tag -d v$1 && git pso :v$1' -
    merged = !sh -c 'git o master && git plom && git bd $1 && git rpo' -
    aliases = !git config -l | grep alias | cut -c 7-
    snap = !git stash save 'snapshot: $(date)' && git stash apply 'stash@{0}'
    bare = !sh -c 'git symbolic-ref HEAD refs/heads/$1 && git rm --cached -r . && git clean -xfd' -
    @@ -240,4 +241,4 @@
    ours = "!f() { git checkout --ours $@ && git add $@; }; f"
    theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
    subrepo = !sh -c 'git filter-branch --prune-empty --subdirectory-filter $1 master' -
    human = name-rev --name-only --refs=refs/heads/*
    human = name-rev --name-only --refs=refs/heads/*
  18. @pksunkara pksunkara revised this gist Jul 26, 2018. 1 changed file with 0 additions and 1 deletion.
    1 change: 0 additions & 1 deletion .gitignore
    View file
    Original file line number Diff line number Diff line change
    @@ -38,4 +38,3 @@ Icon?
    Thumbs.db

    *.lock
    package-lock.json
  19. @pksunkara pksunkara revised this gist Mar 12, 2018. 1 changed file with 6 additions and 1 deletion.
    7 changes: 6 additions & 1 deletion .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -68,6 +68,7 @@
    bdd = branch -D
    br = branch -r
    bc = rev-parse --abbrev-ref HEAD
    bu = !git rev-parse --abbrev-ref --symbolic-full-name "@{u}"
    #############
    c = commit
    ca = commit -a
    @@ -201,6 +202,7 @@
    sp = stash pop
    ss = stash save
    sw = stash show
    st = !git stash list | wc -l 2>/dev/null | grep -oEi '[0-9][0-9]*'
    #############
    t = tag
    td = tag -d
    @@ -232,7 +234,10 @@
    whois = !sh -c 'git log -i -1 --author=\"$1\" --pretty=\"format:%an <%ae>\"' -
    serve = daemon --reuseaddr --verbose --base-path=. --export-all ./.git
    #############
    behind = !git rev-list --left-only --count $(git bu)...HEAD
    ahead = !git rev-list --right-only --count $(git bu)...HEAD
    #############
    ours = "!f() { git checkout --ours $@ && git add $@; }; f"
    theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
    subrepo = !sh -c 'git filter-branch --prune-empty --subdirectory-filter $1 master' -
    human = name-rev --name-only --refs=refs/heads/*
    human = name-rev --name-only --refs=refs/heads/*
  20. @pksunkara pksunkara revised this gist Nov 14, 2017. 1 changed file with 5 additions and 0 deletions.
    5 changes: 5 additions & 0 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -1,6 +1,7 @@
    [user]
    name = Pavan Kumar Sunkara
    email = [email protected]
    username = pksunkara
    [core]
    editor = vim
    whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
    @@ -80,6 +81,7 @@
    cl = clone
    cld = clone --depth 1
    clg = !sh -c 'git clone git://github.com/$1 $(basename $1)' -
    clgp = !sh -c 'git clone [email protected]:$(git config --get user.username)/$1 $1' -
    #############
    cp = cherry-pick
    cpa = cherry-pick --abort
    @@ -200,6 +202,9 @@
    ss = stash save
    sw = stash show
    #############
    t = tag
    td = tag -d
    #############
    w = show
    wp = show -p
    wr = show -p --no-color
  21. @pksunkara pksunkara revised this gist Oct 31, 2017. 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
    @@ -122,7 +122,7 @@
    ps = push
    psf = push -f
    psu = push -u
    pst = ps --tags
    pst = push --tags
    #############
    pso = push origin
    psao = push --all origin
    @@ -220,6 +220,7 @@
    #############
    bump = !sh -c 'git commit -am \"Version bump v$1\" && git psuoc && git release $1' -
    release = !sh -c 'git tag v$1 && git pst' -
    unrelease = !sh -c 'git tag -d v$1 && git pso :v$1' -
    aliases = !git config -l | grep alias | cut -c 7-
    snap = !git stash save 'snapshot: $(date)' && git stash apply 'stash@{0}'
    bare = !sh -c 'git symbolic-ref HEAD refs/heads/$1 && git rm --cached -r . && git clean -xfd' -
  22. @pksunkara pksunkara revised this gist Oct 25, 2017. 2 changed files with 12 additions and 8 deletions.
    17 changes: 9 additions & 8 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -122,6 +122,7 @@
    ps = push
    psf = push -f
    psu = push -u
    pst = ps --tags
    #############
    pso = push origin
    psao = push --all origin
    @@ -177,13 +178,13 @@
    rp = remote prune
    rs = remote show
    rao = remote add origin
    rap = remote add upstream
    rau = remote add upstream
    rro = remote remove origin
    rrp = remote remove upstream
    rru = remote remove upstream
    rso = remote show origin
    rsp = remote show upstream
    rsu = remote show upstream
    rpo = remote prune origin
    rpp = remote prune upstream
    rpu = remote prune upstream
    #############
    rmf = rm -f
    rmrf = rm -r -f
    @@ -217,15 +218,15 @@
    unassumeall = !git assumed | xargs git unassume
    assumeall = !git status -s | awk {'print $2'} | xargs git assume
    #############
    bump = !sh -c 'git commit -am \"Version bump v$1\" && git push origin $(git bc) && git release $1' -
    release = !sh -c 'git tag v$1 && git push --tags' -
    bump = !sh -c 'git commit -am \"Version bump v$1\" && git psuoc && git release $1' -
    release = !sh -c 'git tag v$1 && git pst' -
    aliases = !git config -l | grep alias | cut -c 7-
    snap = !git stash save 'snapshot: $(date)' && git stash apply 'stash@{0}'
    bare = !sh -c 'git symbolic-ref HEAD refs/heads/$1 && git rm --cached -r . && git clean -xfd' -
    whois = !sh -c 'git log -i -1 --pretty=\"format:%an <%ae>\n\" --author=\"$1\"' -
    whois = !sh -c 'git log -i -1 --author=\"$1\" --pretty=\"format:%an <%ae>\"' -
    serve = daemon --reuseaddr --verbose --base-path=. --export-all ./.git
    #############
    ours = "!f() { git checkout --ours $@ && git add $@; }; f"
    theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
    subrepo = !sh -c 'git filter-branch --prune-empty --subdirectory-filter $1 master' -
    human = name-rev --name-only --refs=refs/heads/*
    human = name-rev --name-only --refs=refs/heads/*
    3 changes: 3 additions & 0 deletions .gitignore
    View file
    Original file line number Diff line number Diff line change
    @@ -36,3 +36,6 @@
    ehthumbs.db
    Icon?
    Thumbs.db

    *.lock
    package-lock.json
  23. @pksunkara pksunkara revised this gist Oct 20, 2017. 1 changed file with 56 additions and 32 deletions.
    88 changes: 56 additions & 32 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -64,29 +64,34 @@
    b = branch
    ba = branch -a
    bd = branch -d
    br = branch -r
    bdd = branch -D
    br = branch -r
    bc = rev-parse --abbrev-ref HEAD
    #############
    c = commit
    ca = commit -a
    cm = commit -m
    cem = commit --allow-empty -m
    cam = commit -am
    cem = commit --allow-empty -m
    cd = commit --amend
    cad = commit -a --amend
    ced = commit --allow-empty --amend
    #############
    cl = clone
    cld = clone --depth 1
    clg = !sh -c 'git clone git://github.com/$1 $(basename $1)' -
    #############
    cp = cherry-pick
    cpa = cherry-pick --abort
    cpc = cherry-pick --continue
    #############
    d = diff
    dp = diff --patience
    dc = diff --cached
    dl = difftool
    dlc = difftool --cached
    dk = diff --check
    dp = diff --patience
    dck = diff --cached --check
    dt = difftool
    dct = difftool --cached
    #############
    f = fetch
    fo = fetch origin
    @@ -102,7 +107,7 @@
    lg = log --oneline --graph --decorate
    #############
    ls = ls-files
    lsf = "!git ls-files | grep -i"
    lsf = !git ls-files | grep -i
    #############
    m = merge
    ma = merge --abort
    @@ -117,26 +122,37 @@
    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
    psaom = push --all origin master
    psfom = push -f origin master
    psuom = push -u origin master
    psoc = !git push origin $(git bc)
    psaoc = !git push --all origin $(git bc)
    psfoc = !git push -f origin $(git bc)
    psuoc = !git push -u origin $(git bc)
    psdc = !git push origin :$(git bc)
    #############
    pl = pull
    plu = pull -u
    plo = pull origin
    plp = pull upstream
    plom = pull origin master
    plpm = pull upstream master
    #############
    pb = pull --rebase
    #############
    plo = pull origin
    pbo = pull --rebase origin
    pbp = pull --rebase upstream
    plom = pull origin master
    ploc = !git pull origin $(git bc)
    pbom = pull --rebase origin master
    pbpm = pull --rebase upstream master
    pboc = !git pull --rebase origin $(git bc)
    #############
    plu = pull upstream
    plum = pull upstream master
    pluc = !git pull upstream $(git bc)
    pbum = pull --rebase upstream master
    pbuc = !git pull --rebase upstream $(git bc)
    #############
    rb = rebase
    rba = rebase --abort
    @@ -157,15 +173,20 @@
    ra = remote add
    rr = remote rm
    rv = remote -v
    rm = remote rename
    rn = remote rename
    rp = remote prune
    rs = remote show
    rao = remote add origin
    rau = remote add upstream
    rap = remote add upstream
    rro = remote remove origin
    rrp = remote remove upstream
    rso = remote show origin
    rsu = remote show upstream
    rsp = remote show upstream
    rpo = remote prune origin
    rpu = remote prune upstream
    rpp = remote prune upstream
    #############
    rmf = rm -f
    rmrf = rm -r -f
    #############
    s = status
    sb = status -s -b
    @@ -186,22 +207,25 @@
    svnd = svn dcommit
    svnl = svn log --oneline --show-commit
    #############
    subadd = !sh -c 'git submodule add git://github.com/$1 $2/$(basename $1)' -
    subup = submodule update --init --recursive
    subpull = !git submodule foreach git pull --tags origin master
    #############
    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"
    assumed = !git ls -v | grep ^h | cut -c 3-
    unassumeall = !git assumed | xargs git unassume
    assumeall = !git status -s | awk {'print $2'} | xargs git assume
    #############
    bump = !sh -c 'git commit -am \"Version bump v$1\" && git push origin $(git bc) && git release $1' -
    release = !sh -c 'git tag v$1 && git push --tags' -
    aliases = !git config -l | grep alias | cut -c 7-
    snap = !git stash save 'snapshot: $(date)' && git stash apply 'stash@{0}'
    bare = !sh -c 'git symbolic-ref HEAD refs/heads/$1 && git rm --cached -r . && git clean -xfd' -
    whois = !sh -c 'git log -i -1 --pretty=\"format:%an <%ae>\n\" --author=\"$1\"' -
    serve = daemon --reuseaddr --verbose --base-path=. --export-all ./.git
    #############
    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
    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}"
    subrepo = !sh -c 'git filter-branch --prune-empty --subdirectory-filter $1 master' -
    human = name-rev --name-only --refs=refs/heads/*
  24. @pksunkara pksunkara revised this gist Jun 14, 2017. 1 changed file with 6 additions and 1 deletion.
    7 changes: 6 additions & 1 deletion .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -65,6 +65,7 @@
    ba = branch -a
    bd = branch -d
    br = branch -r
    bdd = branch -D
    #############
    c = commit
    ca = commit -a
    @@ -75,6 +76,10 @@
    cad = commit -a --amend
    ced = commit --allow-empty --amend
    #############
    cp = cherry-pick
    cpa = cherry-pick --abort
    cpc = cherry-pick --continue
    #############
    d = diff
    dc = diff --cached
    dl = difftool
    @@ -199,4 +204,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}"
  25. @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}"
  26. @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}"
  27. @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}"
  28. @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}"
  29. @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
  30. @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