Noratrieb/nixos
1
0
Fork 0
mirror of https://github.com/Noratrieb/nixos.git synced 2026-01-14 11:45:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

git configs

Browse source
This commit is contained in:
nora 2024-02-19 17:25:37 +01:00
parent 2a72464549
commit 08213ec050
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
home-manager/git.nix
View file

@ -10,7 +10,6 @@
s = "status"; s = "status";
rc = "rebase --continue"; rc = "rebase --continue";
ra = "rebase --abort"; ra = "rebase --abort";
# complex renames # complex renames
# TODO: use git-revise # TODO: use git-revise
hardupdate = "!git fetch && git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\""; hardupdate = "!git fetch && git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\"";
@ -23,11 +22,13 @@
enable = true; enable = true;
}; };
extraConfig = { extraConfig = {
# TODO: See https://jvns.ca/blog/2024/02/16/popular-git-config-options
core.autocrlf = false; core.autocrlf = false;
core.editor = "${lib.getExe pkgs.neovim}"; core.editor = "${lib.getExe pkgs.neovim}";
pull.ff = "only"; pull.ff = "only";
push.autoSetupRemote = true; push.autoSetupRemote = true;
init.defaultBranch = "main"; init.defaultBranch = "main";
merge.conflictstyle = "zdiff3";
}; };
}; };
} }