-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
94 lines (68 loc) · 1.96 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
85
86
87
88
89
90
91
92
93
94
;
; User identification
;
[user]
name = Michel Albert
email = [email protected]
signingkey = B594F110
;
; Automatically colorize console output
;
[color]
diff = auto
status = auto
branch = auto
grep = auto
;
; Aliases
;
[alias]
; simple shortcuts
st = status -sb
co = checkout
ci = commit
br = branch -v
; Show abbreviated log with a branch graph
lg = log --all -n20 --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
lga = log --all --graph --pretty=format:'%Cgreen%G?%Creset|%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
lgl = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
lgas = log --all --decorate-refs-exclude="*v????.??.??*" --simplify-by-decoration --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
lgls = log --simplify-by-decoration --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
; Show abbreviated log with timestamps
sl = log --pretty=format:'%an - %Cgreen%ai%Cblue %h%Creset %C(yellow)%d%Creset %s'
; no fast-forward merge
nfm = merge -e --no-ff
[core]
; my global ignores file
excludesfile = ~/.gitignore
; Let's use vim as the default editor
editor=vim
[diff]
tool = vimdiff
[tag]
sort = v:refname
[difftool]
; don't always ask for confirmation to open the diff tool
prompt = false
[merge]
tool = vimdiff
conflictstyle = diff3
prompt = false
[push]
recurseSubmodules = check
default = simple
[init]
templatedir = ~/dotfiles/git-template
defaultBranch = master
[tig "color"]
cursor = yellow 22 bold
[commit]
gpgsign = true
[gpg]
program = gpg2
[rebase]
autostash = true
[pull]
ff = only
[status]
submodulesummary = 1