GitSetup/gitconfig.txt at master · bakgaard/GitSetup · 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
[alias]
	pl = pull
	ps = push
	co = checkout
	br = branch
	rb = rebase
	cm = commit -m
	cma = commit -am
	a = add
	cp = cherry-pick
	rs = reset
	ft = fetch
	ss = status -s
	st = status
	if = clean -ndX #ignored files
	rbc = rebase --continue
	rbs = rebase --skip
	rbr = rebase --reset
	rl = reflog
	mff = merge --no-ff
	ic = update-index --assume-unchaged #tells git to ignore changes to a file that is tracked
	lg = log --graph --pretty=format:'%C(green)%h%Creset:%C(bold yellow)<%an>%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) ' --abbrev-commit --date=relative
	lg2 = log --graph --pretty=format:'%C(green)%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold yellow)<%an>%Creset' --abbrev-commit --date=relative
	lga = !git lg --all
	who = shortlog -n -s --no-merges --all
	dt = difftool --no-prompt
	dtv = difftool --no-prompt --tool=fugitive
	mt = mergetool --no-prompt
	mtv = mergetool --no-prompt --tool=fugitive
	greph = !sh -c 'git grep -I $1 $(git rev-list --all)'
	lost = !sh -c \"'git fsck --lost-found' | awk '/dangling commit/ {print $3}' | git show --format='SHA1: %C(yellow)%h%Creset %f %C(bold blue)<%an>%Creset' --stdin | awk '/SHA1/ {sub(\"SHA1: \", \"\") ; print}'\"
	setupName = config --global user.name
	setupMail = config --global user.email
[core]
	autocrlf = false
	editor = 'code --wait'
[diff]
	tool = p4merge
	guitool = p4merge
[merge]
	tool = p4merge
[mergetool]
	keepBackup = false
[mergetool "p4merge"]
	cmd = \"C:/Program Files/Git/mingw64/libexec/git-core/mergetools/p4merge.exe\" \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
	path = C:/Program Files/Git/mingw64/libexec/git-core/mergetools/p4merge.exe
[push]
	default = simple
[branch]
	autosetuprebase = always
[color]
 	ui = auto
[color "branch"]
 	current = red normal bold
 	local = red normal bold
 	remote = green normal bold
[color "diff"]
 	meta = yellow bold normal bold
 	frag = magenta bold normal bold
 	old = red bold normal bold
 	new = green bold normal bold
[color "status"]
 	added = red normal bold
 	changed = green normal bold
 	untracked = red normal bold