Skip to content

Commit 235eaef

Browse files
committed
Tweaks for the gitconfig and starship
1 parent 9d2066b commit 235eaef

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

gitconfig

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,14 @@
88
diff = auto
99
status = auto
1010
branch = auto
11+
[column]
12+
ui = auto
1113
[diff]
1214
algorithm = histogram
13-
tool = vimdiff
15+
mnemonicPrefix = true
16+
renames = true
17+
[help]
18+
autocorrect = prompt
1419
[alias]
1520
br = branch
1621
ci = "commit -v"
@@ -28,17 +33,24 @@
2833
unstage = reset HEAD --
2934
ours = "!f() { git checkout --ours $@ && git add $@; }; f"
3035
theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
36+
[fetch]
37+
prune = true
38+
pruneTags = true
39+
all = true
3140
[commit]
3241
verbose = true
3342
gpgsign = true
3443
[branch]
3544
autosetuprebase = always
3645
sort = -committerdate
3746
[rebase]
47+
autoSquash = true
3848
autoStash = true
49+
updateRefs = true
3950
[push]
40-
default = upstream
4151
autoSetupRemote = true
52+
default = upstream
53+
followTabs = true
4254
[pull]
4355
rebase = true
4456
[github]

starship/config.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,14 @@ style = "bg:color_blue"
5353

5454
[kubernetes]
5555
disabled = false
56-
format = "[ $symbol$context(:$namespace)]($style)"
56+
format = "[ $symbol$context]($style)"
5757
style = "black bg:color_orange"
5858

59+
[[kubernetes.contexts]]
60+
symbol = ""
61+
context_pattern = 'minikube'
62+
context_alias = ''
63+
5964
[[kubernetes.contexts]]
6065
symbol = "󰡨 "
6166
context_pattern = 'docker-desktop'

0 commit comments

Comments
 (0)