kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-21 20:31:07 +01:00
Code Releases Activity

feat(git): auto stash on merge and rebase

Browse Source
This commit is contained in:
Kierán Meinhardt
2020-11-24 08:49:21 +01:00
parent 080439604b
commit f34a938968
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configs/git.nix
View File

@@ -76,6 +76,8 @@ in
ignores = ignorePaths; ignores = ignorePaths;
extraConfig = { extraConfig = {
pull.ff = "only"; pull.ff = "only";
rebase.autoStash = true;
merge.autoStash = true;
core.pager = core.pager =
"${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | ${pkgs.less}/bin/less --tabs=4 -RFX"; "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | ${pkgs.less}/bin/less --tabs=4 -RFX";
color = { color = {