From 62a2535b040e5588db690d6b22b66a8ed22a774d Mon Sep 17 00:00:00 2001 From: GITHUBFULLNAME Date: Tue, 24 May 2016 20:28:32 -0700 Subject: [PATCH] fix github user replacement --- .gitconfig | 304 ++++++++++++++++++++++++++--------------------------- install.sh | 2 +- oh-my-zsh | 2 +- 3 files changed, 152 insertions(+), 156 deletions(-) diff --git a/.gitconfig b/.gitconfig index b5083ff06..0e6fad06a 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,13 +1,9 @@ [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 @@ -15,168 +11,168 @@ # 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 @@ -184,20 +180,20 @@ [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 diff --git a/install.sh b/install.sh index 0a472e43e..6bd22aef5 100755 --- a/install.sh +++ b/install.sh @@ -62,7 +62,7 @@ if [[ $response =~ ^(no|n|N) ]];then fi fi -grep 'user = atomantic' .gitconfig +grep 'user = GITHUBUSER' .gitconfig if [[ $? = 0 ]]; then read -r -p "What is your github.com username?" githubuser fi diff --git a/oh-my-zsh b/oh-my-zsh index 1e90f3618..9ad9ac69a 160000 --- a/oh-my-zsh +++ b/oh-my-zsh @@ -1 +1 @@ -Subproject commit 1e90f3618f1881d7ed5fb06fee1f2432be036350 +Subproject commit 9ad9ac69a66cb3f61a642241b4723ae7e0789033