/
gitconfig
64 lines (48 loc) · 1.05 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
# Emacs: -*-conf-*-
[alias]
ci = 'commit'
co = 'checkout'
br = 'branch'
up = 'checkout'
st = status -sb
# Incoming changes
in = incoming
# outgoing changes
out = outgoing
undo = reset --soft HEAD^
unstage = reset HEAD --
last = log -1 HEAD
hist = log --all --graph --pretty='[%C(cyan)%h%Creset]%C(bold cyan)%d%Creset %s'
w = whatchanged
recent = branch --sort=-committerdate
[color]
ui = true
[commit]
verbose = true
[core]
autocrlf = input
excludesfile = ~/.gitignore_global
[credential]
helper = cache --timeout=3600
[diff]
submodule = log
noprefix = true
[github]
user = jramnani
[init]
defaultBranch = trunk
[pull]
ff = only
[push]
default = upstream
[rerere]
enabled = true
# Ansible Vault files
[diff "ansible-vault"]
textconv = ansible-vault view
cachetextconv = false
[merge "ansible-vault"]
name = ansible-vault merge driver
driver = /usr/local/bin/ansible-vault-merge -- %O %A %B %P
[include]
path = .gitconfig-user