-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
98 lines (86 loc) · 2.36 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
95
96
97
98
[core]
editor = /usr/local/bin/nvim
pager=less -x4
excludesfile = ~/.gitignore_global
[user]
email = [email protected]
name = Amit
username = amitizle
signingkey = 17FACF698E2BC940
[color]
branch = auto
diff = auto
status = auto
[color "branch"]
current = green reverse
local = blue
remote = red
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = red
[alias]
url = remote get-url origin
lastag = describe --tags --abbrev=0
changed-files = show --pretty="" --name-only
st = status
untracked = ls-files --others --exclude-standard
cl = clone
amend = commit --amend
ai = add --interactive
co = checkout
br = branch
#list commands
le = log --oneline --decorate
l = log --show-signature
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
ls1 = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
lg = log --pretty=format:"%C(yellow)%h\\ %C(green)%ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short --graph
ls = log --pretty=format:"%C(green)%h\\ %C(yellow)[%ad]%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
lc = "!f() { git ll "$1"^.."$1"; }; f"
lnc = log --pretty=format:"%h\\ %s\\ [%cn]"
diff = diff --word-diff
d = difftool
dc = diff --cached
lastdiff = diff HEAD^ HEAD
boom = !git clean -fd && git co -- .
sm = submodule update --init --recursive
root-path = rev-parse --show-toplevel
currbr = rev-parse --abbrev-ref HEAD
ignore = update-index --assume-unchanged
no-ignore = update-index --no-assume-unchanged
[diff]
tool = vimdiff
renames = copies
[difftool]
prompt = false
trustExitCode = true
[mergetool "vimdiff"]
path = /usr/local/bin/nvim
cmd = nvim -d $LOCAL $REMOTE
[merge]
tool = vimdiff
# tool = vimdiff
conflictstyle = diff3
ff = only
[commit]
gpgsign = true
[gpg]
program = /usr/local/bin/gpg
[pager]
branch = false
[log]
follow = true
[includeIf "gitdir:/Users/amit/dev/salto/"]
path = /Users/amit/dev/salto/.salto_gitconfig
[includeIf "gitdir:/tmp/"]
path = /Users/amit/.gitconfig_no_gpg
[includeIf "gitdir:/var/folders/fx/"]
path = /Users/amit/.gitconfig_no_gpg
[pull]
ff = only