File tree Expand file tree Collapse file tree 2 files changed +20
-3
lines changed Expand file tree Collapse file tree 2 files changed +20
-3
lines changed Original file line number Diff line number Diff line change 8
8
diff = auto
9
9
status = auto
10
10
branch = auto
11
+ [column ]
12
+ ui = auto
11
13
[diff ]
12
14
algorithm = histogram
13
- tool = vimdiff
15
+ mnemonicPrefix = true
16
+ renames = true
17
+ [help ]
18
+ autocorrect = prompt
14
19
[alias ]
15
20
br = branch
16
21
ci = "commit -v"
28
33
unstage = reset HEAD --
29
34
ours = " ! f() { git checkout --ours $@ && git add $@ ; }; f "
30
35
theirs = " ! f() { git checkout --theirs $@ && git add $@ ; }; f "
36
+ [fetch ]
37
+ prune = true
38
+ pruneTags = true
39
+ all = true
31
40
[commit ]
32
41
verbose = true
33
42
gpgsign = true
34
43
[branch ]
35
44
autosetuprebase = always
36
45
sort = -committerdate
37
46
[rebase ]
47
+ autoSquash = true
38
48
autoStash = true
49
+ updateRefs = true
39
50
[push ]
40
- default = upstream
41
51
autoSetupRemote = true
52
+ default = upstream
53
+ followTabs = true
42
54
[pull ]
43
55
rebase = true
44
56
[github ]
Original file line number Diff line number Diff line change @@ -53,9 +53,14 @@ style = "bg:color_blue"
53
53
54
54
[kubernetes ]
55
55
disabled = false
56
- format = " [ $symbol$context(:$namespace) ]($style)"
56
+ format = " [ $symbol$context]($style)"
57
57
style = " black bg:color_orange"
58
58
59
+ [[kubernetes .contexts ]]
60
+ symbol = " ☸ "
61
+ context_pattern = ' minikube'
62
+ context_alias = ' '
63
+
59
64
[[kubernetes .contexts ]]
60
65
symbol = " "
61
66
context_pattern = ' docker-desktop'
You can’t perform that action at this time.
0 commit comments