-
Notifications
You must be signed in to change notification settings - Fork 1
/
.gitconfig
84 lines (84 loc) · 2.22 KB
/
.gitconfig
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
[user]
email = [email protected]
name = Nicolas Brassard
[help]
autocorrect = 1
[color]
ui = 1
[core]
excludesfile = ~/.gitignore_global
abbrev = 10
editor = vim
pager = less --tabs=4 -E -RFX
whitespace = trailing-space,space-before-tab,tabwidth=4
[apply]
whitespace = fix
[rerere]
enabled = true
[alias]
lol = log --graph --decorate --pretty=oneline --abbrev-commit --date=auto:human
tags = tag -l
branches = branch -a
remotes = remote -v
rem = rm --cached
cp = cherry-pick
updatesub = submodule foreach git pull origin master
unpushed = log --branches --not --remotes --simplify-by-decoration --decorate --oneline --date=auto:human
pulls = pull --ff-only
pullr = pull --rebase
ff = merge --ff-only
undo = reset --soft HEAD^
patch = format-patch master -1 --stdout
please = push --force-with-lease
poush = push
poh = push origin HEAD
commend = commit --amend --no-edit
search = log --no-merges -i -E --pretty='%h (%ad) - [%an] %s %d' --date=format:'%b %d %Y' --grep
prune = fetch --prune
active = shortlog --numbered --summary --email --no-merges --since=3months
stash-all = stash push -m
sa = stash push -m
rb = for-each-ref --sort=committerdate refs/heads/ --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(color:red)%(objectname:short)%(color:reset) - %(contents:subject) - %(authorname) (%(color:green)%(committerdate:relative)%(color:reset))'
[merge]
conflictstyle = diff3
[push]
followTags = 1
recurseSubmodules = check
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[color "diff"]
meta = 227
frag = magenta bold
commit = 227 bold
old = red bold
new = green bold
whitespace = red reverse
[diff "bin"]
textconv = hexdump -v -C
[diff "bz2"]
binary = true
textconv = /bin/bzcat
[diff "gzip"]
binary = true
textconv = /bin/zcat
[diff "tar"]
binary = true
textconv = tar --to-stdout -xf
[diff "tar-bz2"]
binary = true
textconv = tar --to-stdout -xjf
[diff "zip"]
binary = true
textconv = unzip -p
[transfer]
fsckObjects = true
[merge "npm-merge-driver"]
name = automatically merge npm lockfiles
driver = npx npm-merge-driver merge %A %O %B %P
[status]
submodulesummary = 1
[diff]
submodule = log