diff options
| author | Adrian Kummerlaender | 2020-11-03 15:31:24 +0100 |
|---|---|---|
| committer | Adrian Kummerlaender | 2020-11-03 15:31:24 +0100 |
| commit | c1f5b2a38369f008114834e22a056e45c552a723 (patch) | |
| tree | 62cc60a3693f38bd7cf5e9cdd763e171b9eba7ba /home.nix | |
| parent | b5a3fbb86ee94e5cc67c83cc1c5f96403089d826 (diff) | |
| download | nixos_home-c1f5b2a38369f008114834e22a056e45c552a723.tar nixos_home-c1f5b2a38369f008114834e22a056e45c552a723.tar.gz nixos_home-c1f5b2a38369f008114834e22a056e45c552a723.tar.bz2 nixos_home-c1f5b2a38369f008114834e22a056e45c552a723.tar.lz nixos_home-c1f5b2a38369f008114834e22a056e45c552a723.tar.xz nixos_home-c1f5b2a38369f008114834e22a056e45c552a723.tar.zst nixos_home-c1f5b2a38369f008114834e22a056e45c552a723.zip | |
Update git config
Diffstat (limited to 'home.nix')
| -rw-r--r-- | home.nix | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -37,8 +37,11 @@ in { userName = "Adrian Kummerlaender"; userEmail = "adrian@kummerlaender.eu"; - extraConfig.core.editor = "vim"; - extraConfig.merge.tool = "${pkgs.meld}/bin/meld"; + extraConfig = { + core.editor = "vim"; + merge.tool = "${pkgs.meld}/bin/meld"; + pull.ff = "only"; + }; }; programs.ssh = { |