forked from thomastardy/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
GITHUBFULLNAME
authored and
GITHUBFULLNAME
committed
May 25, 2016
1 parent
84d7c25
commit 62a2535
Showing
3 changed files
with
152 additions
and
156 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,203 +1,199 @@ | ||
| [user] | ||
| name = GITHUBFULLNAME | ||
| email = GITHUBEMAIL | ||
| name = GITHUBFULLNAME | ||
| email = GITHUBEMAIL | ||
| [github] | ||
| # https://github.com/blog/180-local-github-config | ||
| user = GITHUBUSER | ||
|
|
||
| # in a few months, look into the include directive (after bug fixes) | ||
| token = MOVEALONG | ||
|
|
||
| # https://github.com/blog/180-local-github-config | ||
| user = GITHUBUSER | ||
| [color] | ||
| # ui = true is a superset of all the more specific color options | ||
| # as documented at http://book.git-scm.com/5_customizing_git.html | ||
| # When set to always, always use colors in all git commands which are capable of colored output. | ||
| # When false, never. When set to true or auto, use colors only when the output is to the terminal. | ||
| # When more specific variables of color.* are set, they always take precedence over this setting. | ||
| # Defaults to false. | ||
| ui = auto | ||
| # diff = auto | ||
| # status = auto | ||
| # branch = auto | ||
| ui = auto | ||
| # diff = auto | ||
| # status = auto | ||
| # branch = auto | ||
|
|
||
| [color "branch"] | ||
| current = yellow reverse | ||
| local = yellow | ||
| remote = green | ||
| current = yellow reverse | ||
| local = yellow | ||
| remote = green | ||
| [color "diff"] | ||
| meta = yellow bold | ||
| frag = magenta bold | ||
| old = red bold | ||
| new = green bold | ||
| meta = yellow bold | ||
| frag = magenta bold | ||
| old = red bold | ||
| new = green bold | ||
| [color "status"] | ||
| added = yellow | ||
| changed = green | ||
| untracked = cyan | ||
| added = yellow | ||
| changed = green | ||
| untracked = cyan | ||
|
|
||
| [advice] | ||
| statusHints = false | ||
| statusHints = false | ||
|
|
||
| [gui] | ||
| fontdiff = -family Monaco -size 10 -weight normal -slant roman -underline 0 -overstrike 0 | ||
| fontdiff = -family Monaco -size 10 -weight normal -slant roman -underline 0 -overstrike 0 | ||
|
|
||
| [core] | ||
| excludesfile = ~/.gitignore | ||
| quotepath = false | ||
| # line endings | ||
| # force LF during add | ||
| autocrlf = input | ||
| # autocrlf = true # for windows to convert to CRLF on checkout and LF on add | ||
| # warn but allow line ending conversion to proceed | ||
| safecrlf = warn | ||
| # prevent crlf (then you will have to deal with the problem -- dos2unix, etc) | ||
| #safecrlf = true | ||
| editor = vim | ||
| #editor = subl -w | ||
| excludesfile = ~/.gitignore | ||
| quotepath = false | ||
| # line endings | ||
| # force LF during add | ||
| autocrlf = input | ||
| # autocrlf = true # for windows to convert to CRLF on checkout and LF on add | ||
| # warn but allow line ending conversion to proceed | ||
| safecrlf = warn | ||
| # prevent crlf (then you will have to deal with the problem -- dos2unix, etc) | ||
| #safecrlf = true | ||
| editor = vim | ||
| #editor = subl -w | ||
|
|
||
| [alias] | ||
| # most commonly used | ||
| co = checkout | ||
| d = diff --color-words | ||
| cam = commit -a -m | ||
| upm = !git fetch upstream && git merge upstream/master | ||
|
|
||
| # least used | ||
| br = branch -a | ||
| s = status -s -u | ||
| cl = log --stat -C -2 | ||
| c = commit | ||
| dh = diff HEAD | ||
| dc = diff --staged | ||
| dw = diff --word-diff | ||
| dcw = diff --color-words | ||
| dm = !git diff | subl | ||
| dv = !git diff | vim | ||
| who = shortlog -s -- | ||
| ph = push | ||
| pl = pull | ||
| lp = log -p | ||
| lod = log --oneline --decorate | ||
| lg = log --graph | ||
| lpo = log --pretty=oneline --abbrev-commit --graph --decorate --all | ||
| l1 = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative | ||
| l2 = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative | ||
| spull = !git-svn fetch && git-svn rebase | ||
| spush = !git-svn dcommit | ||
| sync = !git pull && git push | ||
| es = !git pull --rebase && git push | ||
| lf = log --pretty=fuller | ||
| ignorechanges = update-index --assume-unchanged | ||
| noticechanges = update-index --no-assume-unchanged | ||
| gc-ap = gc --aggressive --prune | ||
| listconf = config --global --list | ||
| lsm = log -M --stat | ||
| hse = log --stat -5 | ||
| diffall = diff HEAD | ||
| logr = log -M | ||
| logr2 = log --stat -M -2 | ||
| logit = log --stat -M | ||
| scrub = !git reset --hard && git clean -fd | ||
| pub = !git pub checkout master && git pull && git checkout dev && git rebase master && git checkout master && git merge dev && git wtf | ||
| cs = status | ||
| rv = remote -v | ||
| lwr = log --stat -C | ||
| pur = pull --rebase | ||
| whatis = show -s --pretty='tformat:%h (%s, %ad)' --date=short | ||
| orphank = !gitk --all `git reflog | cut -c1-7`& | ||
| orphanl = !git log --pretty=oneline --abbrev-commit --graph --decorate `git reflog | cut -c1-7` | ||
| k = !exec gitk --all& | ||
| testecho1 = !sh -c 'echo with slash: zero=$0 one=$1 two=$2' - | ||
| # te1 RESULT: with slash: zero=- one=A two=B | ||
| testecho2 = !sh -c 'echo without slash: zero=$0 one=$1 two=$2' | ||
| # te2 RESULT: without slash: zero=A one=B two=C | ||
| st = status | ||
| l = log --stat -C | ||
| ll = log --stat -C -3 | ||
| servehere = daemon --verbose --informative-errors --reuseaddr --export-all --base-path=. --enable=receive-pack | ||
| purgeme = !git clean -fd && git reset --hard | ||
| prunenow = gc --prune=now | ||
| ri = rebase --interactive --autosquash | ||
| lol = log --pretty=oneline --graph --abbrev-commit --all | ||
| blg = log --graph --decorate --all --abbrev-commit --pretty=oneline | ||
| slog = log --graph --simplify-by-decoration --all --abbrev-commit --pretty=oneline | ||
| lgso = log --graph --date=short --pretty=format:'%C(yellow)%h%Creset %cn%x09%cd %s%C(green bold)%d' | ||
| ro = !git fetch origin && git reset --hard origin/master | ||
| shorten = "!sh -c 'curl -i http://git.io -F url=$1' -" | ||
| pushnotes = !sh -c 'git push $1 refs/notes/*' - | ||
| fetchnotes = !sh -c 'git fetch $1 refs/notes/*:refs/notes/*' - | ||
| showignored = clean -ndX | ||
| showignored2 = ls-files --others --ignored --exclude-standard | ||
| showuntracked = ls-files --others --exclude-standard | ||
| rmmissing = !git rm $(git ls-files --deleted) | ||
| mergekeepoursonly = merge -s ours | ||
| redocommit = reset --soft HEAD^ | ||
| listunstaged = diff --name-status | ||
| liststaged = diff --name-status --staged | ||
| listhistory = log --name-status | ||
| logn = log --oneline --name-only | ||
| busypeople = shortlog -6 | ||
| busythisweek = shortlog --since=one.week.ago | ||
| configpushtracking = config push.default tracking | ||
| configpushnothing = config push.default nothing | ||
| configpushmatching = config push.default matching | ||
| configpushcurrent = config push.default current | ||
|
|
||
| nr = "!sh -c 'git init $0'" | ||
| echoparam1 = "!sh -c 'echo $0'" | ||
| #testshfunction = "!function gitme() { git init $1; cd $1; }; gitme" | ||
|
|
||
| fixup = "!sh -c 'git commit -m \"fixup! $(git log -1 --format='\\''%s'\\'' $@)\"' -" | ||
| squash = "!sh -c 'git commit -m \"squash! $(git log -1 --format='\\''%s'\\'' $@)\"' -" | ||
| ccfq = "!sh -c 'git add $1 && git commit -m\"Placeholder\"' -" | ||
| cob = checkout -b | ||
| sno = show --name-only | ||
| logsimple = log --graph --abbrev-commit --pretty=oneline --all --decorate | ||
| # most commonly used | ||
| co = checkout | ||
| d = diff --color-words | ||
| cam = commit -a -m | ||
| upm = !git fetch upstream && git merge upstream/master | ||
|
|
||
| # least used | ||
| br = branch -a | ||
| s = status -s -u | ||
| cl = log --stat -C -2 | ||
| c = commit | ||
| dh = diff HEAD | ||
| dc = diff --staged | ||
| dw = diff --word-diff | ||
| dcw = diff --color-words | ||
| dm = !git diff | subl | ||
| dv = !git diff | vim | ||
| who = shortlog -s -- | ||
| ph = push | ||
| pl = pull | ||
| lp = log -p | ||
| lod = log --oneline --decorate | ||
| lg = log --graph | ||
| lpo = log --pretty=oneline --abbrev-commit --graph --decorate --all | ||
| l1 = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative | ||
| l2 = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative | ||
| spull = !git-svn fetch && git-svn rebase | ||
| spush = !git-svn dcommit | ||
| sync = !git pull && git push | ||
| es = !git pull --rebase && git push | ||
| lf = log --pretty=fuller | ||
| ignorechanges = update-index --assume-unchanged | ||
| noticechanges = update-index --no-assume-unchanged | ||
| gc-ap = gc --aggressive --prune | ||
| listconf = config --global --list | ||
| lsm = log -M --stat | ||
| hse = log --stat -5 | ||
| diffall = diff HEAD | ||
| logr = log -M | ||
| logr2 = log --stat -M -2 | ||
| logit = log --stat -M | ||
| scrub = !git reset --hard && git clean -fd | ||
| pub = !git pub checkout master && git pull && git checkout dev && git rebase master && git checkout master && git merge dev && git wtf | ||
| cs = status | ||
| rv = remote -v | ||
| lwr = log --stat -C | ||
| pur = pull --rebase | ||
| whatis = show -s --pretty='tformat:%h (%s, %ad)' --date=short | ||
| orphank = !gitk --all `git reflog | cut -c1-7`& | ||
| orphanl = !git log --pretty=oneline --abbrev-commit --graph --decorate `git reflog | cut -c1-7` | ||
| k = !exec gitk --all& | ||
| testecho1 = !sh -c 'echo with slash: zero=$0 one=$1 two=$2' - | ||
| # te1 RESULT: with slash: zero=- one=A two=B | ||
| testecho2 = !sh -c 'echo without slash: zero=$0 one=$1 two=$2' | ||
| # te2 RESULT: without slash: zero=A one=B two=C | ||
| st = status | ||
| l = log --stat -C | ||
| ll = log --stat -C -3 | ||
| servehere = daemon --verbose --informative-errors --reuseaddr --export-all --base-path=. --enable=receive-pack | ||
| purgeme = !git clean -fd && git reset --hard | ||
| prunenow = gc --prune=now | ||
| ri = rebase --interactive --autosquash | ||
| lol = log --pretty=oneline --graph --abbrev-commit --all | ||
| blg = log --graph --decorate --all --abbrev-commit --pretty=oneline | ||
| slog = log --graph --simplify-by-decoration --all --abbrev-commit --pretty=oneline | ||
| lgso = log --graph --date=short --pretty=format:'%C(yellow)%h%Creset %cn%x09%cd %s%C(green bold)%d' | ||
| ro = !git fetch origin && git reset --hard origin/master | ||
| shorten = "!sh -c 'curl -i http://git.io -F url=$1' -" | ||
| pushnotes = !sh -c 'git push $1 refs/notes/*' - | ||
| fetchnotes = !sh -c 'git fetch $1 refs/notes/*:refs/notes/*' - | ||
| showignored = clean -ndX | ||
| showignored2 = ls-files --others --ignored --exclude-standard | ||
| showuntracked = ls-files --others --exclude-standard | ||
| rmmissing = !git rm $(git ls-files --deleted) | ||
| mergekeepoursonly = merge -s ours | ||
| redocommit = reset --soft HEAD^ | ||
| listunstaged = diff --name-status | ||
| liststaged = diff --name-status --staged | ||
| listhistory = log --name-status | ||
| logn = log --oneline --name-only | ||
| busypeople = shortlog -6 | ||
| busythisweek = shortlog --since=one.week.ago | ||
| configpushtracking = config push.default tracking | ||
| configpushnothing = config push.default nothing | ||
| configpushmatching = config push.default matching | ||
| configpushcurrent = config push.default current | ||
|
|
||
| nr = "!sh -c 'git init $0'" | ||
| echoparam1 = "!sh -c 'echo $0'" | ||
| #testshfunction = "!function gitme() { git init $1; cd $1; }; gitme" | ||
|
|
||
| fixup = "!sh -c 'git commit -m \"fixup! $(git log -1 --format='\\''%s'\\'' $@)\"' -" | ||
| squash = "!sh -c 'git commit -m \"squash! $(git log -1 --format='\\''%s'\\'' $@)\"' -" | ||
| ccfq = "!sh -c 'git add $1 && git commit -m\"Placeholder\"' -" | ||
| cob = checkout -b | ||
| sno = show --name-only | ||
| logsimple = log --graph --abbrev-commit --pretty=oneline --all --decorate | ||
| [apply] | ||
| whitespace = nowarn | ||
| whitespace = nowarn | ||
|
|
||
| [rerere] | ||
| #Enable the recording of resolved conflicts, so that identical hunks can be resolved automatically later on | ||
| enabled = 1 | ||
| #Enable the recording of resolved conflicts, so that identical hunks can be resolved automatically later on | ||
| enabled = 1 | ||
|
|
||
| [difftool] | ||
| prompt = false | ||
| prompt = false | ||
|
|
||
| [diff] | ||
| tool = vimdiff | ||
| tool = vimdiff | ||
|
|
||
| [init] | ||
| templatedir = ~/.dotfiles/.git_template | ||
| templatedir = ~/.dotfiles/.git_template | ||
|
|
||
| [mergetool] | ||
| prompt = false | ||
| keepBackup = false | ||
| prompt = false | ||
| keepBackup = false | ||
|
|
||
| [merge] | ||
| tool = vimdiff | ||
| # Always show a diffstat at the end of a merge | ||
| stat = true | ||
| conflictstyle = diff3 | ||
| tool = vimdiff | ||
| # Always show a diffstat at the end of a merge | ||
| stat = true | ||
| conflictstyle = diff3 | ||
|
|
||
| [branch] | ||
| # Automatically set up pull to be --rebase | ||
| # autosetuprebase = always | ||
|
|
||
| [credential] | ||
| # cache creds (git help credential-cache) | ||
| helper = cache | ||
| helper = cache | ||
|
|
||
| [filter "tabspace"] | ||
| clean = expand -t 4 | ||
| clean = expand -t 4 | ||
|
|
||
| [push] | ||
| default = matching | ||
| default = matching | ||
|
|
||
| [filter "media"] | ||
| required = true | ||
| clean = git media clean %f | ||
| smudge = git media smudge %f | ||
| required = true | ||
| clean = git media clean %f | ||
| smudge = git media smudge %f | ||
|
|
||
| [filter "lfs"] | ||
| clean = git-lfs clean %f | ||
| smudge = git-lfs smudge %f | ||
| required = true | ||
| clean = git-lfs clean %f | ||
| smudge = git-lfs smudge %f | ||
| required = true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule oh-my-zsh
updated
from 1e90f3 to 9ad9ac