dotfiles/dot_gitconfig at master · acasajus/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
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
[user]
	name = Adria Casajus
	email = adriancasajus@gmail.com
[submodule]
	recurse = true
[color "branch"]
	current = yellow reverse
	local = yellow
	remote = green
[color "diff"]
	meta = yellow bold
	frag = magenta bold
	old = red bold
	new = green bold
[alias]
	st = status
	ci = commit
	br = branch -v
	cp = cherry-pick -x
	mt = mergetool

	#checkout
	co = checkout
	cob = checkout -b

	#diff
	df = diff
	dc = diff --cached
	last = diff HEAD^..HEAD
	dt = difftool

	#log
	log = log --decorate --graph --date=short
	l = log --pretty=full
	changes = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" --name-status
	short = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\"
	changelog = log --pretty=format:\" * %s\"
	shortnocolor = log --pretty=format:\"%h %cr %cn %s\"
	graph = log --graph --full-history --all --color --pretty=format:"%x1b[31m%h%x09%x1b[32m%d%x1b[0m%x20%s"
	gs = log --graph --color --pretty=format:"%x1b[31m%h%x09%x1b[32m%d%x1b[0m%x20%s"

	#show
	sf =  show --pretty="" --name-only

	#remotes
	upr = remote update --prune

	#Show branches by date
	brd = for-each-ref --sort=-committerdate refs/heads/ --format='%(color:yellow)%(if)%(HEAD)%(then)* %(else)  %(end)%(color:green)%(refname:short)\t%(color:blue)%(subject)' refs/heads/
	brdo = for-each-ref --sort=-committerdate refs/heads/ --format='%(if)%(HEAD)%(then)* %(else)  %(end)%(refname:short)' refs/heads/

	#Show tags
	td = for-each-ref --sort=creatordate refs/tags/ --format='%(color:blue)%(creatordate:iso) %(color:green)%(refname:short) %(color:yellow)%(objectname:short) %(color:magenta)%(creator)'

	#push
	pushf = push --force-with-lease
  poh = push origin -u HEAD

[format]
	pretty = format:%C(blue)%ad%Creset %C(yellow)%h%C(green)%d%Creset %C(blue)%s %C(magenta) [%an]%Creset

[merge]
	summary = true
	verbosity = 1
	tool = meld

[mergetool]
	prompt = false
	keepBackup = false

[branch]
	autosetupmerge = true
	autosetuprebase = always

[diff]
	tool = meld
	#external = difft
	mnemonicprefix = true

[tag]
	sort=creatordate

[difftool]
	prompt = false

[push]
	default = simple

[core]
	editor = nvim
	pager = less -F -X
	excludesfile = /Users/acasajus/.gitignore_global
	#fsmonitor = true

[color]
	ui = true

[difftool "sourcetree"]
	cmd = open -W -a Meld --args \"$LOCAL\" \"$REMOTE\"
	path =
[mergetool "sourcetree"]
	cmd = /Applications/p4merge.app/Contents/MacOS/p4merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
	trustExitCode = true

[difftool "Kaleidoscope"]
	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[mergetool "Kaleidoscope"]
	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" \"$REMOTE\"

[filter "lfs"]
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	process = git-lfs filter-process
	required = true

[rerere]
	enabled = true

[include]
	path = .gitconfig.local

[init]
	defaultBranch = main

[includeIf "gitdir:~/Dev/proton/"]
	path = ~/Dev/proton/.gitconfig

[maintenance]
	repo = /Users/acasajus/Dev/proton/containers_v2/webserver/repos/api
	repo = /Users/acasajus/Dev/proton/clients