git: Reformat config files
This commit is contained in:
parent
a79896c7ee
commit
b64604c549
4 changed files with 51 additions and 43 deletions
14
git/config
14
git/config
|
|
@ -1,16 +1,21 @@
|
|||
[blame]
|
||||
markIgnoredLines = true
|
||||
markUnblameableLines = true
|
||||
|
||||
[color]
|
||||
ui = true
|
||||
|
||||
[diff]
|
||||
colorMoved = default
|
||||
wsErrorHighlight = all
|
||||
|
||||
[merge]
|
||||
conflictStyle = diff3
|
||||
ff = only
|
||||
|
||||
[pull]
|
||||
ff = only
|
||||
|
||||
[push]
|
||||
default = simple
|
||||
|
||||
|
|
@ -22,12 +27,12 @@
|
|||
chk = commit -a -n -m 'CHECKPOINT'
|
||||
co = checkout
|
||||
cp = cherry-pick
|
||||
d = diff
|
||||
dc = diff --cached
|
||||
d = diff
|
||||
dn = diff --name-only --relative
|
||||
dw = diff --word-diff
|
||||
f = fetch
|
||||
fb = "!fb() { git fetch \"$1\" \"$2\":\"$2\"; }; fb"
|
||||
f = fetch
|
||||
fp = fetch --prune
|
||||
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)'
|
||||
|
|
@ -35,13 +40,16 @@
|
|||
pushf = push --force-with-lease
|
||||
rb = rebase
|
||||
root = rev-parse --show-toplevel
|
||||
s = status
|
||||
sb = show-branch
|
||||
s = status
|
||||
untracked = ls-files --others --exclude-standard
|
||||
|
||||
[credential]
|
||||
helper = cache
|
||||
|
||||
[commit]
|
||||
verbose = true
|
||||
|
||||
[core]
|
||||
excludesfile = ~/.gitignore
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue