colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[git] Clean up whitespace in config

Browse Source
This commit is contained in:
Ivan Malison 2016-12-05 23:22:07 -08:00
parent 72e427efb7
commit 1183381eb6
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dotfiles/gitconfig
View File

@ -23,14 +23,14 @@
ffr = "!ffr() { git fetch $1 && git ff $1/$(git which-branch) && git suir; }; ffr" ffr = "!ffr() { git fetch $1 && git ff $1/$(git which-branch) && git suir; }; ffr"
file-exists = "!f() { git ls-files $1 --error-unmatch > /dev/null 2> /dev/null; }; f" file-exists = "!f() { git ls-files $1 --error-unmatch > /dev/null 2> /dev/null; }; f"
force-master = "!f() { git fetch origin && git rh && git master; }; f" force-master = "!f() { git fetch origin && git rh && git master; }; f"
icd = "!d() { git difftool --no-prompt --extcmd 'icdiff --cols=200' $@ | $(git config --get core.pager); }; d" icd = "!d() { git difftool --no-prompt --extcmd 'icdiff --cols=200' $@ | $(git config --get core.pager); }; d"
icdl = "!d() { git difftool --no-prompt --extcmd 'icdiff --line-numbers --cols=200' $@ | $(git config --get core.pager); }; d" icdl = "!d() { git difftool --no-prompt --extcmd 'icdiff --line-numbers --cols=200' $@ | $(git config --get core.pager); }; d"
ignore = "!i() { printf \"\n$1\" >> "`git root`/.gitignore"; }; i" ignore = "!i() { printf \"\n$1\" >> "`git root`/.gitignore"; }; i"
ignore-untracked="!git untracked | xargs -n1 git ignore" ignore-untracked="!git untracked | xargs -n1 git ignore"
l = log --pretty=oneline --graph l = log --pretty=oneline --graph
master = checkout origin/master -B master master = checkout origin/master -B master
modified = diff HEAD --name-only modified = diff HEAD --name-only
poh = push origin HEAD poh = push origin HEAD
pohm = push origin HEAD:master pohm = push origin HEAD:master
power-clean = clean -ffd power-clean = clean -ffd
reb = "!r() { git rebase -i HEAD~$1; }; r" # Interactive rebase with the given number of latest commits reb = "!r() { git rebase -i HEAD~$1; }; r" # Interactive rebase with the given number of latest commits
@ -74,10 +74,10 @@
added = green added = green
changed = yellow changed = yellow
untracked = red untracked = red
[merge] [merge]
conflictstyle = diff3 conflictstyle = diff3
[include] [include]
path = ~/.gitconfig.custom path = ~/.gitconfig.custom
path = ~/.gitconfig.this-machine path = ~/.gitconfig.this-machine
@ -92,4 +92,4 @@
insteadOf = https://code.uber.internal/ insteadOf = https://code.uber.internal/
[branch] [branch]
autosetuprebase = always autosetuprebase = always