jalil/configuration.nix
1
1
Fork 0
Code Issues 1 Pull requests Projects Activity Actions

feat(git): Extra options

Browse source 
Saw some cool git options thanks to @b0rk@jvns.ca so I added them c:
This commit is contained in:
Jalil David Salamé Messina 2024-02-08 20:18:34 +01:00
parent a5cdfb91a3
commit ca03244de8
Signed by: jalil
GPG key ID: F016B9E770737A0B
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
home/default.nix
View file

@ -39,7 +39,14 @@ in
programs.git.difftastic.background = "dark";
programs.git.lfs.enable = true;
programs.git.extraConfig.init.defaultBranch = "main";
# Better conflicts (also shows parent commit state)
programs.git.extraConfig.merge.conflictStyle = "zdiff3";
# Do not create merge commits when pulling (rebase but abort on conflict)
programs.git.extraConfig.pull.ff = "only";
# Use `--set-upstream` if the remote does not have the branch
programs.git.extraConfig.push.autoSetupRemote = true;
# If there are uncommitted changes, stash them before rebasing
programs.git.extraConfig.rebase.autoStash = true;
programs.lazygit.enable = true;
# Mail client
programs.himalaya.enable = true;