You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
122 lines
2.6 KiB
122 lines
2.6 KiB
# vim: set sw=2 sts=2 ts=2 noexpandtab :
|
|
[color]
|
|
ui = auto
|
|
branch = auto
|
|
diff = auto
|
|
grep = auto
|
|
interactive = auto
|
|
status = auto
|
|
|
|
[user]
|
|
email = info@wpstudio.ru
|
|
name = WP Studio
|
|
|
|
[core]
|
|
autocrlf = false
|
|
excludesfile = ~/.gitignore_global
|
|
whitespace = blank-at-eol,blank-at-eof,space-before-tab
|
|
|
|
[push]
|
|
default = simple
|
|
|
|
[rerere]
|
|
enabled = true
|
|
autoupdate = true
|
|
|
|
[rebase]
|
|
# Automatically stash before a rebase and unstash afterwards.
|
|
autoStash = true
|
|
|
|
[commit]
|
|
# Show diff when preparing commit message
|
|
verbose = true
|
|
template = ~/.gitmessage
|
|
|
|
[alias]
|
|
a = add
|
|
s = status
|
|
st = status
|
|
ci = commit
|
|
b = branch
|
|
co = checkout
|
|
re = remote
|
|
d = diff
|
|
dc = diff --cached
|
|
lol = log --graph --decorate --pretty=oneline --abbrev-commit
|
|
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
|
|
ls = ls-files
|
|
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
|
|
lgi = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --abbrev-commit
|
|
# Pull Upstream
|
|
pu = !"git fetch origin -v; git fetch upstream -v; git merge upstream/master"
|
|
# Commit Amend Reuse Message HEAD
|
|
carmh = commit --amend --reuse-message=HEAD
|
|
# Push Current
|
|
pc = !"f() { remote=\"${1:-origin}\"; git push -u \"$remote\" $(git rev-parse --abbrev-ref HEAD); }; f"
|
|
# Push Current Force
|
|
pcf = !"f() { echo git pc \"$@\" -f; }; f"
|
|
# Mainly for YADM
|
|
untracked = !"f() { git status --porcelain=v1 -zunormal | xargs -0n1 printf \"%s\\n\" | grep -E '^\\?\\? \\.' | cut -c4-; }; f"
|
|
# Current branch
|
|
current = rev-parse --abbrev-ref HEAD
|
|
cof = !git for-each-ref --format='%(refname:short)' refs/heads | fzf | xargs git checkout
|
|
|
|
[merge]
|
|
tool = vimdiff
|
|
conflictstyle = diff3
|
|
|
|
[mergetool]
|
|
prompt = false
|
|
keepBackup = false
|
|
|
|
[mergetool "vimdiff"]
|
|
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
|
|
|
|
###
|
|
### Git-up specific
|
|
### https://github.com/aanand/git-up
|
|
###
|
|
[git-up "rebase"]
|
|
arguments = --preserve-merges
|
|
|
|
###
|
|
### Github specific
|
|
###
|
|
[github]
|
|
user = dimti
|
|
|
|
# read from given uri
|
|
# push to writable one
|
|
# http://bit.ly/g9c9Y2
|
|
#
|
|
[url "http://github.com/"]
|
|
insteadOf = "gh:"
|
|
|
|
[url "git@github.com:"]
|
|
pushInsteadOf = "https://github.com/"
|
|
pushInsteadOf = "http://github.com/"
|
|
pushInsteadOf = "gh:"
|
|
|
|
[credential]
|
|
helper = "cache --timeout 86400"
|
|
|
|
[pack]
|
|
threads = 2
|
|
|
|
###
|
|
### Include local overrides
|
|
###
|
|
[include]
|
|
path = .gitconfig.local
|
|
|
|
[pull]
|
|
rebase = true
|
|
|
|
[lfs]
|
|
fetchexclude = *
|
|
|
|
[filter "lfs"]
|
|
clean = git-lfs clean -- %f
|
|
smudge = git-lfs smudge -- %f
|
|
process = git-lfs filter-process
|
|
required = true
|