git: Config tweaks
This commit is contained in:
parent
ea822a05dd
commit
096c11fee2
1 changed files with 3 additions and 1 deletions
|
@ -24,8 +24,10 @@
|
||||||
lfs.enable = true;
|
lfs.enable = true;
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
branch.autosetuprebase = "always";
|
branch.autosetuprebase = "always";
|
||||||
pull.rebase = true;
|
|
||||||
github.user = "chvp";
|
github.user = "chvp";
|
||||||
|
merge.conflictStyle = "diff3";
|
||||||
|
pull.rebase = true;
|
||||||
|
rerere.enabled = true;
|
||||||
tag.gpgSign = true;
|
tag.gpgSign = true;
|
||||||
};
|
};
|
||||||
ignores = [
|
ignores = [
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue