brethil/dotfiles
1
0
Fork 0
mirror of https://git.decapod.one/brethil/dotfiles synced 2024-11-24 12:31:31 +01:00
Code Issues Releases Wiki Activity

update git config

Browse Source
This commit is contained in:
bretello 2020-12-03 18:29:40 +01:00
parent a02fa47017
commit fc70cb13a8
Signed by: brethil
GPG Key ID: 876AAC6290170FE7
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gitconfig
View File

@ -1,6 +1,10 @@
# vi:syntax=gitconfig
[core] [core]
excludesfile = ~/.gitignore excludesfile = ~/.gitignore
#[init]
# templatedir = ~/.git_template
[pull] [pull]
ff = only ff = only
rebase = true rebase = true
@ -9,12 +13,24 @@ rebase = true
ff = only ff = only
tool = vimdiff2 tool = vimdiff2
[mergetool]
keepBackup = false
[diff] [diff]
tool = vimdiff2 tool = vimdiff2
[difftool]
prompt=true
[rebase] [rebase]
autostash = true autostash = true
autosquash = true autosquash = true
squash = true
[log] [log]
abbrevcommit = true abbrevcommit = true
[format]
#pretty = format:%C(yellow)commit %h%Cred%d %Creset%nAuthor: %Cblue%>(12)%an%n%CgreenDate: %ar%Creset%n%n%B
[alias]
showtool = "!showci () { rev=${1:-HEAD}; git difftool $rev~1 $rev; }; showci $1"