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.
31 lines
858 B
31 lines
858 B
[diff] |
|
tool = vimdiff |
|
|
|
[difftool "vimdiff"] |
|
cmd = vimdiff \"$LOCAL\" \"$REMOTE\" |
|
|
|
[core] |
|
pager = less -FRX |
|
[alias] |
|
glog = log --graph |
|
glogs = log --graph --stat |
|
ci = commit |
|
st = status |
|
sglog = log --oneline --decorate --graph --all |
|
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset %Cblue<%an>%Creset' --abbrev-commit --date=relative |
|
co = checkout |
|
out = log --branches --not --remotes |
|
inc = log ..@{u} |
|
vimdiff = difftool -y -t vimdiff |
|
|
|
# tricks from https://www.durdn.com/blog/2012/11/22/must-have-git-aliases-advanced-examples/ |
|
# if no file is specified, show diff for all files in the changeset |
|
diffc = "!f() { git diff ${1}^1 ${1} -- $2; }; f" |
|
vimdiffc = "!f() { git vimdiff ${1}^1 ${1} -- $2; }; f" |
|
|
|
[user] |
|
name = Petr Nyc |
|
email = jet.jetpac@gmail.com |
|
|
|
[merge] |
|
tool = vimdiff
|
|
|