dotfiles/dot_gitconfig at main · marsmike/dotfiles · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
[user]
	name = Mike Mueller
	email = mike@objektarium.de

[alias]
	# Status & info
	st = status
	br = branch -av
	branches = branch -a
	tags = tag -l
	remotes = remote -v
	currentbranch = !git branch --show-current
	out = log @{u}..

	# Committing
	cm = commit
	ci = commit
	amend = "!git log -n 1 --pretty=tformat:%s%n%n%b | git commit -F - --amend"
	fixup = commit --fixup=HEAD

	# Branching & navigation
	co = checkout
	sw = switch

	# Diffing
	df = diff
	dfs = diff --staged
	wdiff = diff --color-words

	# Logging
	l = "log -16 --color=always --all --topo-order --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative"
	ll = "log --color=always --all --topo-order --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
	lg = "log -10 --color=always --all --graph --topo-order --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative"
	lgl = "log --color=always --all --graph --topo-order --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
	logg = log --graph --decorate --oneline --all

[core]
	editor = nvim

[fetch]
	prune = true

[push]
	autoSetupRemote = true

[pull]
	ff = only

[rebase]
	autoSquash = true

[merge]
	conflictstyle = zdiff3

[diff]
	algorithm = histogram

[rerere]
	enabled = true

[log]
	follow = true

[column]
	ui = auto

[init]
	defaultBranch = main

[credential "https://github.com"]
	helper =
	helper = !gh auth git-credential

[credential "https://gist.github.com"]
	helper =
	helper = !gh auth git-credential

[credential]
	helper = store

[url "https://github.com/"]
	insteadOf = gh:

[url "https://gist.github.com/"]
	insteadOf = gist:

[url "https://bitbucket.org/"]
	insteadOf = bb:

[color]
	ui = true

[color "branch"]
	current = yellow reverse
	local = yellow
	remote = green

[color "diff"]
	meta = yellow bold
	frag = magenta bold
	old = red bold
	new = green bold

[color "status"]
	added = yellow
	changed = green
	untracked = red