diff --git a/options/custom/programs/git.nix b/options/custom/programs/git.nix index 1a90ed7..6dfcf17 100644 --- a/options/custom/programs/git.nix +++ b/options/custom/programs/git.nix @@ -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;