-
Notifications
You must be signed in to change notification settings - Fork 1
/
.gitconfig
68 lines (54 loc) · 1.78 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
[init]
defaultBranch = main
[core]
excludesfile = ~/.cvsignore
attributesfile = ~/.gitattributes
[diff]
tool = difftastic
external = difft
[difftool]
prompt = false
[difftool "difftastic"]
cmd = difft "$LOCAL" "$REMOTE"
[pager]
difftool = true
[user]
name = Rainer Borene
email = [email protected]
[grep]
extendedRegexp = true
lineNumber = true
[push]
default = current
[pull]
rebase = true
[color]
ui = auto
[merge]
summary = true
prompt = false
tool = fugitive
[mergetool]
keepBackup = false
keepTemporaries = false
[mergetool "fugitive"]
cmd = "nvim -f -c 'Gvdiff' $MERGED"
[alias]
a = add
s = status
p = push
d = diff
ba = branch -a
dc = diff --cached
co = checkout
ci = commit
uns = reset HEAD
unstage = reset HEAD
l = log -16 --color=always --all --topo-order --pretty='format:%Cgreen%h%Creset %s%Cred%d%Creset %C(blue bold)(by %an)%Creset'
ll = log --color=always --all --topo-order --pretty='format:%Cgreen%h%Creset %s%Cred%d%Creset %C(blue bold)(by %an)%Creset'
gl = log -10 --color=always --all --graph --topo-order --pretty='format:%Cgreen%h%Creset %s %C(blue bold)(by %an)%Creset%C(yellow bold)%d%Creset%n'
gll = log --color=always --all --graph --topo-order --pretty='format:%Cgreen%h%Creset %s %C(blue bold)(by %an)%Creset%C(yellow bold)%d%Creset%n'
changed = git diff-tree --no-commit-id --name-only -r
work = !sh -c 'git fetch && git checkout @{upstream} -tb \"$@\"'
dft = difftool
dlog = "!f() { GIT_EXTERNAL_DIFF=difft git log -p --ext-diff $@; }; f"