-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
91 lines (73 loc) · 1.97 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
[user]
name = Derek Greer
email = [email protected]
[core]
filemode = true
editor = vim
autocrlf = true
askpass = git-gui--askpass
[color]
diff = auto
status = auto
branch = auto
interactive = auto
ui = true
pager = true
[diff]
tool = kdiff3
[difftool]
prompt = false
[difftool "kdiff3"]
path = /mnt/c/Program Files/KDiff3/kdiff3.exe
trustExitCode = false
cmd = kdiff3.exe `wslpath -w $LOCAL` `wslpath -w $REMOTE`
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
[merge]
tool = kdiff3
[mergetool]
keepBackup = false
keepTempporaries = false
trustExitCode = false
[mergetool "kdiff3"]
path = /mnt/c/Program Files/KDiff3/kdiff3.exe
[mergetool "vscode"]
cmd = code --wait $MERGED
[push]
default = simple
followTags = true
[alias]
aliases = config --get-regexp '^alias\\.'
lns = log --name-status
prev = checkout @{-1}
co = checkout
br = branch --sort=-committerdate
branch = branch --sort=-committerdate
st = status
unstage = reset HEAD --
last = log -1 HEAD
clean-all = clean -x -d -f
graph = log --graph --decorate
edit-config = config --global --edit
diff-main = log --cherry-pick --oneline --no-merges --right-only main...HEAD
diff-develop = log --cherry-pick --oneline --no-merges --right-only develop...HEAD
diff-branch = "!f() { git log --cherry-pick --oneline --no-merges --right-only \"$1...HEAD\"; }; f"
lol = log --graph --decorate --pretty=oneline --abbrev-commit
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
review = "!f() { git fetch origin \"$1\" ; git checkout \"$1\"; }; f"
pw-reset = config --global credential.helper osxkeychain
pw-reset-win = config --global credential.helper wincred
[pull]
rebase = true
[rerere]
enabled = true
[winUpdater]
recentlySeenVersion = 2.20.1.windows.1
[http]
sslVerify = false
[credential]
#helper = osxkeychain
#helper = manager
#helper = osxkeychain
[remote "origin"]
prune = true