aboutsummaryrefslogtreecommitdiff
path: root/.gitconfig
blob: a0f8219f859a3d642499698aee5afc3b7bce4a67 (plain)
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
[user]
	email = [email protected]
	name = Guangxiong Lin
	signingkey = DC290711AFF905FA
[commit]
	gpgsign = true
[gpg]
	program = gpg
[merge]
	tool = vimdiff
[diff]
	tool = vimdiff
[diff "gpg"]
	textconv = gpg -o-
[core]
	excludesFile = ~/.gitignore
	attributesfile = ~/.gitattributes
[alias]
	ap = add --patch

	# commit
	ci = commit -v
	cia = commit -v --amend
	cian = commit -v --amend --no-edit

	br = branch
	co = checkout
	st = status
	stsb = status --short --branch
	df = diff
	dfc = diff --cached
	dt = difftool
	mt = mergetool

	who = blame

	untrack = rm --cached
	unstage = restore --staged

	lo = log --oneline --graph --decorate
	loa = log --oneline --graph --decorate --all

	lol = log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'
	lols = log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --stat
	lola = log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --all

	cp = cherry-pick
	cpa = cherry-pick --abort
	cpc = cherry-pick --continue

	rb = rebase
	rbi = rebase -i
	rbc = rebase --continue
	rba = rebase --abort
	rbs = rebase --skip

	# contrib

	# git-jump
	jp = jump
	jd = jump diff
	jm = jump merge
	jg = jump grep
	jw = jump ws
[rebase]
	autosquash = true

[include]
	path = ~/.gitconfig_local