cy/nixos-config
cy/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

git enable signoff and change mergetool

Browse source 
Signed-off-by: cy <cy@cy7.sh>
This commit is contained in:
cy 2025-01-24 05:44:35 -05:00
parent 947249cc79
commit 4fa0aed92e
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
home/yt/common.nix
View file

@ -44,7 +44,11 @@
rebase = true;
autostash = true;
};
merge.tool = "vimdiff";
merge = {
tool = "vimdiff";
keepBackup = false;
prompt = false;
};
rebase = {
stat = true;
autoStash = true;
@ -52,10 +56,7 @@
updateRefs = true;
};
help.autocorrect = 1;
mergetool = {
prompt = false;
path = "nvim-open";
};
"mergetool \"vimdiff\"".cmd = "nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'";
};
};
programs.ripgrep.enable = true;

4
home/zsh/default.nix
View file

@ -94,8 +94,8 @@
"ga" = "git add";
"gaa" = "git add --all";
"gb" = "git branch";
"gc" = "git commit --verbose";
"gcmsg" = "git commit --message";
"gc" = "git commit --verbose -s";
"gcmsg" = "git commit -s --message";
"gd" = "git diff";
"gdca" = "git diff --cached";
"gds" = "git diff --staged";