mirror of
https://github.com/itme-brain/nixos.git
synced 2026-03-24 08:39:42 -04:00
gitmergetool = lazygit
This commit is contained in:
parent
1ac58c9cce
commit
01ca2f2c22
1 changed files with 9 additions and 0 deletions
|
|
@ -6,6 +6,15 @@
|
||||||
|
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
init = { defaultBranch = "main"; };
|
init = { defaultBranch = "main"; };
|
||||||
|
mergetool = {
|
||||||
|
lazygit = {
|
||||||
|
cmd = "lazygit";
|
||||||
|
trustExitCode = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
merge = {
|
||||||
|
tool = "lazygit";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
ignores = [
|
ignores = [
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue