kadet/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git: Allow .local gitconfig

Browse Source
This commit is contained in:
Kacper Donat 2024-02-04 16:44:43 +01:00
parent 415bb26c8f
commit c8d910ad6b
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.gitconfig
View File

@ -1,12 +1,9 @@
[user] [user]
name = Kacper Donat name = Kacper Donat
email = kadet1090@gmail.com email = kadet1090@gmail.com
[alias] [alias]
st = status
ci = commit
co = checkout co = checkout
br = branch
unstage = reset HEAD -- unstage = reset HEAD --
last = log -1 HEAD last = log -1 HEAD
@ -15,16 +12,25 @@
ktokurwa = blame ktokurwa = blame
[push] [push]
default = current default = current
autoSetupRemote = true
[merge "ours"] [merge "ours"]
driver = true driver = true
[core] [core]
excludesfile = ~/.gitignore excludesfile = ~/.gitignore
autocrlf = input autocrlf = input
commentchar = ";"
[mergetool "nvimdiff"] [mergetool "nvimdiff"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[difftool] [difftool]
tool = nvimdiff tool = nvimdiff
[rebase]
autosquash = true
[include]
path = ~/.gitconfig.local