git additional settings
parent
07ededb06c
commit
b61cff4fe0
|
@ -120,6 +120,16 @@
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
merge = { tool = "vimdiff"; conflictstyle = "diff3"; };
|
merge = { tool = "vimdiff"; conflictstyle = "diff3"; };
|
||||||
};
|
};
|
||||||
|
ignores = [
|
||||||
|
# vscode-related settings
|
||||||
|
".vscode"
|
||||||
|
# envrc cached outputs
|
||||||
|
".direnv"
|
||||||
|
];
|
||||||
|
extraConfig = {
|
||||||
|
# cache credential for 10 minutes.
|
||||||
|
credential.helper = "cache --timeout=600"
|
||||||
|
};
|
||||||
# why is this no longer valid?
|
# why is this no longer valid?
|
||||||
# pull = { rebase=true; };
|
# pull = { rebase=true; };
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue