mirror of
https://github.com/Noratrieb/nixos.git
synced 2026-01-14 19:55:08 +01:00
Add some more git options
This commit is contained in:
parent
3eaedbafaa
commit
6238aa9a57
1 changed files with 8 additions and 0 deletions
|
|
@ -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/";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue