diff options
| author | Minijackson <minijackson@riseup.net> | 2021-05-19 21:35:18 +0200 |
|---|---|---|
| committer | Minijackson <minijackson@riseup.net> | 2021-05-19 21:35:18 +0200 |
| commit | 1cece9eaa6e19a84d0a4c72235ef8534637bae0f (patch) | |
| tree | bf8129ef6f2aaea6361424da81d03809865703db /common/commandline | |
| parent | 54d3070b405c11c233658739ee8e454c2233c45b (diff) | |
| download | nixos-config-reborn-1cece9eaa6e19a84d0a4c72235ef8534637bae0f.tar.gz nixos-config-reborn-1cece9eaa6e19a84d0a4c72235ef8534637bae0f.zip | |
git: set pull to ff-only by default
Diffstat (limited to 'common/commandline')
| -rw-r--r-- | common/commandline/git.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/common/commandline/git.nix b/common/commandline/git.nix index e231356..914cdb4 100644 --- a/common/commandline/git.nix +++ b/common/commandline/git.nix | |||
| @@ -21,6 +21,9 @@ inputs: | |||
| 21 | pager = deltaCommand; | 21 | pager = deltaCommand; |
| 22 | interactive.diffFilter = "${deltaCommand} --color-only"; | 22 | interactive.diffFilter = "${deltaCommand} --color-only"; |
| 23 | }; | 23 | }; |
| 24 | |||
| 25 | pull.ff = "only"; | ||
| 26 | |||
| 24 | merge = { tool = "nvimdiff"; }; | 27 | merge = { tool = "nvimdiff"; }; |
| 25 | "mergetool \"nvimdiff\"" = { cmd = "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\""; }; | 28 | "mergetool \"nvimdiff\"" = { cmd = "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\""; }; |
| 26 | 29 | ||