[git] Clean up whitespace in config
This commit is contained in:
parent
72e427efb7
commit
1183381eb6
@ -23,14 +23,14 @@
|
||||
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"
|
||||
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"
|
||||
ignore = "!i() { printf \"\n$1\" >> "`git root`/.gitignore"; }; i"
|
||||
ignore-untracked="!git untracked | xargs -n1 git ignore"
|
||||
l = log --pretty=oneline --graph
|
||||
master = checkout origin/master -B master
|
||||
modified = diff HEAD --name-only
|
||||
poh = push origin HEAD
|
||||
poh = push origin HEAD
|
||||
pohm = push origin HEAD:master
|
||||
power-clean = clean -ffd
|
||||
reb = "!r() { git rebase -i HEAD~$1; }; r" # Interactive rebase with the given number of latest commits
|
||||
@ -74,10 +74,10 @@
|
||||
added = green
|
||||
changed = yellow
|
||||
untracked = red
|
||||
|
||||
|
||||
[merge]
|
||||
conflictstyle = diff3
|
||||
|
||||
|
||||
[include]
|
||||
path = ~/.gitconfig.custom
|
||||
path = ~/.gitconfig.this-machine
|
||||
@ -92,4 +92,4 @@
|
||||
insteadOf = https://code.uber.internal/
|
||||
|
||||
[branch]
|
||||
autosetuprebase = always
|
||||
autosetuprebase = always
|
||||
|
Loading…
Reference in New Issue
Block a user