... | ... |
@@ -13,3 +13,33 @@ |
13 | 13 |
|
14 | 14 |
[init] |
15 | 15 |
templateDir = ~/.gittemplate |
16 |
+ defaultBranch = master |
|
17 |
+ ; defaultBranch = main |
|
18 |
+ |
|
19 |
+[remote] |
|
20 |
+ pushDefault = origin |
|
21 |
+ |
|
22 |
+[push] |
|
23 |
+ default = current |
|
24 |
+ recurseSubmodules = check |
|
25 |
+ |
|
26 |
+[branch] |
|
27 |
+ autoSetupMerge = always |
|
28 |
+ autoSetupRebase = always |
|
29 |
+ |
|
30 |
+[fetch] |
|
31 |
+ prune = true |
|
32 |
+ pruneTags = true |
|
33 |
+ |
|
34 |
+[rebase] |
|
35 |
+ autoSquash = true |
|
36 |
+ autoStash = true |
|
37 |
+ updateRefs = true |
|
38 |
+ missingCommitsCheck = error |
|
39 |
+ |
|
40 |
+[pull] |
|
41 |
+ rebase = merges |
|
42 |
+ |
|
43 |
+[merge] |
|
44 |
+ ff = false |
|
45 |
+ autoStash = true |