kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-19 19:41:08 +01:00
Code Releases Activity

feat(git): dont automatically merge on pull

Browse Source
This commit is contained in:
Kierán Meinhardt
2020-10-30 08:08:20 +01:00
parent 394615168d
commit 0be0356005
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configs/git.nix
View File

@@ -71,6 +71,7 @@
}; };
ignores = config.niveum.ignore; ignores = config.niveum.ignore;
extraConfig = { extraConfig = {
pull.ff = "only";
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 = {