cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more more git config to nix

Browse source
This commit is contained in:
Cyryl Płotnicki 2020-08-01 08:33:33 +01:00
parent 767ed20cfb
commit d7a942a480
2 changed files with 4 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
.gitconfig_includes.common
View file

@ -1,35 +1,3 @@
[user]
name = Cyryl Płotnicki
email = cyplo@cyplo.net
[color]
ui = true
[help]
autocorrect = 1
[push]
default = simple
[core]
pager = cat
[alias]
tree = log --show-signature --color --decorate --date=short --all --graph -n 3
parent = log --pretty=%P -n 1
newbranch = !git checkout master && git fetch -p && git reset --hard origin/master && git checkout -b "$2"
head = log HEAD -n1
signedcommit = !git commit -S
[core]
autocrlf = false
[diff]
tool = vimdiff
[difftool]
prompt = false
[difftool "vimdiff"]
cmd = vim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)' $LOCAL $REMOTE '+syntax off'
[merge]
tool = kdiff3
[mergetool]
keepBackup = false
[pager]
diff = diff-so-fancy | less --tabs=1,5 -RFX
show = diff-so-fancy | less --tabs=1,5 -RFX
[filter "lfs"] [filter "lfs"]
clean = git-lfs clean -- %f clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f smudge = git-lfs smudge -- %f

4
nixos/git/home.nix
View file

@ -8,6 +8,10 @@
extraConfig = { extraConfig = {
credential = { helper ="cache"; }; credential = { helper ="cache"; };
core = { pager = "cat"; }; core = { pager = "cat"; };
colour.ui = true;
help.autocorrect = 1;
push.default = "simple";
mergetool.keepBackup = false;
pager = { pager = {
diff = "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | less --tabs=1,5 -RFX"; diff = "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | less --tabs=1,5 -RFX";
show = "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | less --tabs=1,5 -RFX"; show = "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | less --tabs=1,5 -RFX";