git: Set default branch name
This commit is contained in:
parent
6d7bb763dd
commit
212b3c839e
1 changed files with 3 additions and 0 deletions
|
|
@ -13,6 +13,9 @@ wsErrorHighlight = all
|
||||||
[diff "rspec"]
|
[diff "rspec"]
|
||||||
xfuncname = "^[ \t]*((RSpec|describe|context|it|before|after|around|feature|scenario|background)[ \t].*)$"
|
xfuncname = "^[ \t]*((RSpec|describe|context|it|before|after|around|feature|scenario|background)[ \t].*)$"
|
||||||
|
|
||||||
|
[init]
|
||||||
|
defaultBranch = main
|
||||||
|
|
||||||
[merge]
|
[merge]
|
||||||
conflictStyle = diff3
|
conflictStyle = diff3
|
||||||
ff = only
|
ff = only
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue