~cyplo/dotfiles

b77145858f6574ba8b03520b5c4ea3a98b26d99a — Cyryl Płotnicki 1 year, 1 month ago 1c28001
more more git config to nix
2 files changed, 4 insertions(+), 32 deletions(-)

M .gitconfig_includes.common
M nixos/git/home.nix
M .gitconfig_includes.common => .gitconfig_includes.common +0 -32
@@ 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"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f

M nixos/git/home.nix => nixos/git/home.nix +4 -0
@@ 8,6 8,10 @@
    extraConfig = {
      credential = { helper ="cache"; };
      core = { pager = "cat"; };
      colour.ui = true;
      help.autocorrect = 1;
      push.default = "simple";
      mergetool.keepBackup = false;
      pager = {
        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";