Skip to content

Instantly share code, notes, and snippets.

@lukemorton
Last active March 19, 2020 09:51
Show Gist options
  • Select an option

  • Save lukemorton/7084d1bffd5967e44d2810200dac0f8c to your computer and use it in GitHub Desktop.

Select an option

Save lukemorton/7084d1bffd5967e44d2810200dac0f8c to your computer and use it in GitHub Desktop.

Revisions

  1. lukemorton revised this gist Mar 19, 2020. No changes.
  2. lukemorton revised this gist Mar 19, 2020. 1 changed file with 27 additions and 16 deletions.
    43 changes: 27 additions & 16 deletions .gitconfig
    Original file line number Diff line number Diff line change
    @@ -1,17 +1,28 @@
    [alias]
    st = status -sb
    co = checkout
    cp = cherry-pick
    ci = commit
    br = branch
    sub = submodule
    ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
    ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
    undo = reset HEAD^
    p = !git stash && git pull --recurse-submodules && git stash pop
    pp = !git p && git push
    lsnc = log --pretty=format:"%h\\ %s\\ [%cn]" --decorate
    y = log --author="Luke\\ Morton" --since="1\\ day\\ ago" --all --reverse --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s" --decorate
    springcleanremote = remote prune origin
    springcleanlocal = !git branch | grep -v ^* | grep -v "master" | xargs git branch -D
    springclean = !git springcleanremote && git springcleanlocal
    st = status -sb
    co = checkout
    cp = cherry-pick
    ci = commit
    br = branch
    sub = submodule
    ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
    ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
    undo = reset HEAD^
    p = !git stash && git pull --recurse-submodules && git stash pop
    og = !git stash && git fetch && git rebase origin/master && git stash pop
    pp = !git p && git push
    lsnc = log --pretty=format:"%h\\ %s\\ [%cn]" --decorate
    y = log --author="Luke\\ Morton" --since="1\\ day\\ ago" --all --reverse --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s" --decorate
    springcleanremote = remote prune origin
    springcleanlocal = !git branch | grep -v ^* | grep -v "master" | xargs git branch -D
    springclean = !git springcleanremote && git springcleanlocal

    [credential]
    helper = osxkeychain
    [user]
    name = Luke Morton
    email = [email protected]
    [core]
    editor = atom --wait
    [pull]
    rebase = true
  3. lukemorton created this gist Jan 23, 2018.
    17 changes: 17 additions & 0 deletions .gitconfig
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,17 @@
    [alias]
    st = status -sb
    co = checkout
    cp = cherry-pick
    ci = commit
    br = branch
    sub = submodule
    ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
    ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
    undo = reset HEAD^
    p = !git stash && git pull --recurse-submodules && git stash pop
    pp = !git p && git push
    lsnc = log --pretty=format:"%h\\ %s\\ [%cn]" --decorate
    y = log --author="Luke\\ Morton" --since="1\\ day\\ ago" --all --reverse --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s" --decorate
    springcleanremote = remote prune origin
    springcleanlocal = !git branch | grep -v ^* | grep -v "master" | xargs git branch -D
    springclean = !git springcleanremote && git springcleanlocal