jdkaplan/dotfiles
1
0
Fork 0
Code Activity

git: Reformat config files

Browse source
This commit is contained in:
Jeremy Kaplan 2020-02-20 07:44:10 -08:00
commit b64604c549
4 changed files with 51 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

14
git/config
View file

@ -1,16 +1,21 @@
[blame] [blame]
markIgnoredLines = true markIgnoredLines = true
markUnblameableLines = true markUnblameableLines = true
[color] [color]
ui = true ui = true
[diff] [diff]
colorMoved = default colorMoved = default
wsErrorHighlight = all wsErrorHighlight = all
[merge] [merge]
conflictStyle = diff3 conflictStyle = diff3
ff = only ff = only
[pull] [pull]
ff = only ff = only
[push] [push]
default = simple default = simple
@ -22,12 +27,12 @@
chk = commit -a -n -m 'CHECKPOINT' chk = commit -a -n -m 'CHECKPOINT'
co = checkout co = checkout
cp = cherry-pick cp = cherry-pick
d = diff
dc = diff --cached dc = diff --cached
d = diff
dn = diff --name-only --relative dn = diff --name-only --relative
dw = diff --word-diff dw = diff --word-diff
f = fetch
fb = "!fb() { git fetch \"$1\" \"$2\":\"$2\"; }; fb" fb = "!fb() { git fetch \"$1\" \"$2\":\"$2\"; }; fb"
f = fetch
fp = fetch --prune fp = fetch --prune
lag = log --graph --decorate --pretty='%C(auto)%h%d %s | %C(cyan)%an%C(reset) %C(green)<%ar>%C(reset)' lag = log --graph --decorate --pretty='%C(auto)%h%d %s | %C(cyan)%an%C(reset) %C(green)<%ar>%C(reset)'
lg = log --graph --decorate --pretty='%C(auto)%h%d %s | %C(cyan)%cn%C(reset) %C(green)<%cr>%C(reset)' lg = log --graph --decorate --pretty='%C(auto)%h%d %s | %C(cyan)%cn%C(reset) %C(green)<%cr>%C(reset)'
@ -35,13 +40,16 @@
pushf = push --force-with-lease pushf = push --force-with-lease
rb = rebase rb = rebase
root = rev-parse --show-toplevel root = rev-parse --show-toplevel
s = status
sb = show-branch sb = show-branch
s = status
untracked = ls-files --others --exclude-standard untracked = ls-files --others --exclude-standard
[credential] [credential]
helper = cache helper = cache
[commit] [commit]
verbose = true verbose = true
[core] [core]
excludesfile = ~/.gitignore excludesfile = ~/.gitignore