git 配置

vi ~/.gitconfig

安装开源命令行对比工具 delta: https://github.com/dandavison/delta
详细设置delta：https://www.5axxw.com/wiki/content/xrx4vf

conda install git-delta -c conda-forge  #安装git-delta

[user]
	name = xx
	email = xx@xxxx.com

[core]
	attributesfile = ~/.gitattributes
	pager = delta
	quotepath = false
	
[credential]
	helper = cache --timeout=3600

[color]
	diff = auto
	status = auto
	branch = auto
	interactive = auto
	ui = true
	pager = true

[interactive]
	diffFilter = delta --color-only

[pull]
	rebase = true
	
[diff]
	colorMoved = default
	
[diff "image"]
	command = compare $2 $1 png:- | montage -geometry +4+4 $2 - $1 png:- | display -title \"$1\" -

[merge]
	conflictstyle = diff3
	ff = no
	commit = no

[delta]
	side-by-side = true
	line-numbers-left-format = ""
	line-numbers-right-format = "│ "
	syntax-theme = Nord
	navigate = true
	light = false

[clone]
	#recurseSubmodules = true

[alias]
	st = status
	br = branch
	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
	last = log -1
	#清理当前分支的 git commit --amend 记录，因为 git reflog可以查看到，末尾加上 --all 清理所有分支
	clr= reflog expire --expire=now
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