dotfiles/gitconfig.std at master · JrCs/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
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
[checkout]
	guess = true

[color]
	ui = auto
	wtf = auto
[color "diff"]
	commit = 184
	old = 9
	new = green
[color "diff-highlight"]
	oldNormal = 9
	oldHighlight = black 9
	newNormal = green
	newHighlight = black green
[color "branch"]
	current = green
	local = yellow
	remote = red
[color "status"]
	added = yellow
	changed = green
	untracked = cyan
[diff-so-fancy]
	markEmptyLines = false
[core]
	pager = diff-so-fancy | less --tabs=4 -RFX
	excludesfile = ~/.gitignore

[alias]
	st = status
	cav = commit -a -v
	ci = commit
	br = branch -vv
	co = checkout
	df = diff
	dc = diff --cached
	dw = diff --word-diff --color-words
	dis = diff --ignore-all-space
	lg = log --graph --pretty=tformat:'%C(auto)%h%Creset - %s%C(auto)%d%Creset %C(green)(%C(bold blue)%an%Creset %C(green)%ar)%Creset'
	lp = log -p
	lol = log --graph --decorate --pretty=oneline --abbrev-commit --show-notes=*
	lola = log --graph --decorate --pretty=oneline --abbrev-commit --all --show-notes=*
	lr = log -g
	sp = "!bash -ic 'fshow \"$@\"'"
	sw = "switch"
	ls = ls-files
	oops = commit --amend --no-edit
	# Prune local tags
	pt = "!f() { git fetch --prune $(git remote) +refs/tags/*:refs/tags/*; }; f"
	scrub = "!f() { git branch --merged | sed -r '/^([+*]|\\s*master).*/d' | xargs -r git branch -d; }; f"

	# Show files ignored by git:
	ign = ls-files -o -i --exclude-standard
	unstage = reset HEAD --

	# Checkout a pull request from origin (of a github repository)
	pr = !"pr() { git fetch origin pull/$1/head:pr-$1; git checkout pr-$1; }; pr"

	addpr = "!f() { b=`git symbolic-ref -q --short HEAD` && \
		echo \"Making branch for pull request #$1 [pr/$1]\" && \
		git fetch origin pull/$1/head:pr/$1 && \
		echo \"Rebasing pr/$1 onto $b...\" && \
		git fetch -q -f origin pull/$1/merge:refs/PR_MERGE_HEAD && \
		git rebase -q --onto $b PR_MERGE_HEAD^ pr/$1 && \
		git checkout -q $b && echo && \
		git diff --stat $b..pr/$1 && echo && \
		git log --oneline $b..pr/$1; \
		git update-ref -d refs/PR_MERGE_HEAD; \
	}; f"

[diff]
	mnemonicPrefix = true
	renames = copies
	wordRegex = .
	submodule = log

[fetch]
	recurseSubmodules = on-demand
	prune = true

[grep]
	extendedRegexp = true

[apply]
	whitespace = nowarn

[branch]
	autosetupmerge = true

[log]
	abbrevCommit = true
	decorate = short
	date = local
	follow = true

[rebase]
	autosquash = true

[merge]
	tool = meld
	log = true

[mergetool.ediff]
	cmd = xemacs --eval \"(progn (setq ediff-quit-hook 'kill-emacs) (ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\"))\"
	trustExitCode = false

[pull]
	# This is GREAT… when you know what you're doing and are careful
	# not to pull --no-rebase over a local line containing a true merge.
	# rebase = true
	# WARNING! This option, which does away with the one gotcha of
	# auto-rebasing on pulls, is only available from 1.8.5 onwards.
	rebase = merges

[push]
	default = upstream

[rerere]
	autoupdate = true
	enabled = true

[status]
	submoduleSummary = true
	showUntrackedFiles = all

[tag]
	sort = version:refname

# URL shorthands
[url "git@github.com:"]
	insteadOf = "gh:"
	pushInsteadOf = "github:"
	pushInsteadOf = "git://github.com/"

[url "git://github.com/"]
	insteadOf = "github:"

[url "git@gist.github.com:"]
	insteadOf = "gst:"
	pushInsteadOf = "gist:"
	pushInsteadOf = "git://gist.github.com/"

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

[url "git@gitlab.cnp.recouv"]
	insteadOf = "https://gitlab.cnp.recouv"