Add some more git options

This commit is contained in:
nora 2024-06-02 10:39:07 +02:00
parent 3eaedbafaa
commit 6238aa9a57

View file

@ -29,6 +29,14 @@
push.autoSetupRemote = true;
init.defaultBranch = "main";
merge.conflictstyle = "zdiff3";
# https://github.com/rust-lang/rust/blob/a83cf567b5949691de67f06895d9fe0404c40d27/.git-blame-ignore-revs
blame.ignoreRevsFile = ".git-blame-ignore-revs";
# This makes it so that pushing always uses SSH, even if the remote was configured as HTTPS.
"url \"git@github.com:\"".pushInsteadOf = "https://github.com/";
"url \"git@gitlab.com:\"".pushInsteadOf = "https://gitlab.com/";
"url \"git@gist.github.com:\"".pushInsteadOf = "https://gist.github.com/";
};
};
}