65 lines
1.3 KiB
Text
65 lines
1.3 KiB
Text
[blame]
|
|
markIgnoredLines = true
|
|
markUnblameableLines = true
|
|
|
|
[color]
|
|
ui = true
|
|
|
|
[diff]
|
|
colorMoved = default
|
|
wsErrorHighlight = all
|
|
|
|
[merge]
|
|
conflictStyle = diff3
|
|
ff = only
|
|
|
|
[pull]
|
|
ff = only
|
|
|
|
[push]
|
|
default = simple
|
|
|
|
[alias]
|
|
ap = add -p
|
|
b = branch
|
|
bn = symbolic-ref --short HEAD
|
|
bp = !git remote prune origin && git branch -vv | grep ': gone]' | vipe | awk '{print $1}' | xargs git branch -D
|
|
bv = branch -vv
|
|
c = commit
|
|
chk = commit -a -n -m 'CHECKPOINT'
|
|
co = checkout
|
|
cp = cherry-pick
|
|
dc = diff --cached
|
|
d = diff
|
|
dn = diff --name-only --relative
|
|
dw = diff --word-diff
|
|
fb = "!fb() { git fetch \"$1\" \"$2\":\"$2\"; }; fb"
|
|
f = fetch
|
|
fp = fetch --prune
|
|
fixup = commit --amend --no-edit
|
|
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)'
|
|
mb = merge-base HEAD
|
|
pushf = push --force-with-lease
|
|
pushu = "!pushu() { git push --set-upstream \"${1:-origin}\" \"${2:-$(git bn)}\"; }; pushu"
|
|
rb = rebase
|
|
root = rev-parse --show-toplevel
|
|
sb = show-branch
|
|
s = status
|
|
untracked = ls-files --others --exclude-standard
|
|
|
|
[credential]
|
|
helper = cache
|
|
|
|
[commit]
|
|
verbose = true
|
|
|
|
[core]
|
|
excludesfile = ~/.gitignore
|
|
|
|
[include]
|
|
path = config-os
|
|
path = config-role
|
|
|
|
[includeIf "gitdir:~/projects/"]
|
|
path = config-personal
|