Myned/nixos
Myned/nixos
1
1
Fork 0
Code Issues Activity

git: set pull.rebase

Browse source
This commit is contained in:
Myned 2025-03-31 19:17:38 -05:00
parent e2e2bc1c4f
commit 38b64244ea
Signed by: Myned
GPG key ID: C7224454F7881A34
1 changed files with 3 additions and 0 deletions

3
options/custom/programs/git.nix
View file

@ -66,6 +66,9 @@ in {
# https://git-scm.com/docs/git-config#Documentation/git-config.txt-mergeconflictStyle
merge.conflictStyle = "zdiff3";
# https://git-scm.com/docs/git-config#Documentation/git-config.txt-pullrebase
pull.rebase = true;
# https://git-scm.com/docs/git-config#Documentation/git-config.txt-pushautoSetupRemote
push.autoSetupRemote = true;