felix/dotfiles
1
0
Fork 0
mirror of https://github.com/Stunkymonkey/dotfiles.git synced 2025-05-24 02:54:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

git: update config

Browse source
This commit is contained in:
Felix Buehler 2025-02-27 22:35:46 +01:00
parent c3b81b726d
commit cb8eb6dbbe
1 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
git/gitconfig
View file

@ -9,7 +9,7 @@
[merge] [merge]
defaultToUpstream = true defaultToUpstream = true
tool = vimdiff tool = vimdiff
conflictstyle = diff3 conflictstyle = zdiff3
[core] [core]
editor = vim editor = vim
eol = native eol = native
@ -27,6 +27,7 @@
unstage = reset HEAD -- unstage = reset HEAD --
[rerere] [rerere]
enabled = true enabled = true
autoupdate = true
[branch] [branch]
autoSetupMerge = always autoSetupMerge = always
# Fetch also the merge requests data for common remotes # Fetch also the merge requests data for common remotes
@ -39,7 +40,10 @@
fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/* fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/*
[diff] [diff]
tool = vimdiff tool = vimdiff
colormoved = default colorMoved = plain
algorithm = histogram
mnemonicPrefix = true
renames = true
[difftool] [difftool]
prompt = false prompt = false
[color.blame] [color.blame]
@ -72,6 +76,7 @@
light = false light = false
[pull] [pull]
ff = only ff = only
rebase = true
[url "ssh://git@github.com/"] [url "ssh://git@github.com/"]
pushInsteadOf = https://github.com/ pushInsteadOf = https://github.com/
[url "ssh://git@gitlab.com/"] [url "ssh://git@gitlab.com/"]
@ -80,3 +85,13 @@
pushInsteadOf = https://bitbucket.org/ pushInsteadOf = https://bitbucket.org/
[push] [push]
autoSetupRemote = true autoSetupRemote = true
default = simple
followTags = true
[tag]
sort = version:refname
[fetch]
prune = true
pruneTags = true
all = true
[help]
autocorrect = prompt