-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitconfig
More file actions
77 lines (77 loc) · 2.17 KB
/
.gitconfig
File metadata and controls
77 lines (77 loc) · 2.17 KB
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
[user]
name = Boris Churzin
email = boris@nilus.com
[alias]
ci = commit
st = status
co = checkout
cob = "!f() { git show-ref --verify --quiet refs/heads/$1 && git checkout $1 || git checkout -b $1 origin/main ; }; f"
com = checkout origin/main
facob = !git fa && git cob
br = branch
di = diff -w
dc = diff --cached -w
fa = fetch --all
farbo = !git fa && git rebase origin/main -q
pr = !CURRENT=$(git rev-parse --abbrev-ref HEAD) && git pull --rebase origin $CURRENT
mt = mergetool
rb = rebase -i
rbo = rebase origin/main -i
rbc = rebase --continue
rba = rebase --abort
[core]
autocrlf = input
eol = lf
# pager = delta
[color]
branch = auto
diff = auto
interactive = auto
status = auto
ui = true
[merge]
tool = diffconflicts
conflictstyle = diff3
[push]
default = current
[pull]
default = current
rebase = true
[advice]
commitBeforeMerge = true
[init]
templateDir = /home/devenv/.git-templates/git-secrets
defaultBranch = master
#[diff]
#colorMoved = default
#tool = difftastic
#external = difft
#[difftool "difftastic"]
#cmd = difft "$LOCAL" "$REMOTE"
[mergetool "diffconflicts"]
cmd = nvim -c DiffConflictsWithHistory \"$MERGED\" \"$BASE\" \"$LOCAL\" \"$REMOTE\"
trustExitCode = true
[mergetool]
keepBackup = false
[credential]
helper = cache --timeout=680400
[secrets]
providers = git secrets --aws-provider
patterns = [A-Z0-9]{20}
patterns = (\"|')?(AWS|aws|Aws)?_?(SECRET|secret|Secret)?_?(ACCESS|access|Access)?_?(KEY|key|Key)(\"|')?\\s*(:|=>|=)\\s*(\"|')?[A-Za-z0-9/\\+=]{40}(\"|')?
patterns = (\"|')?(AWS|aws|Aws)?_?(ACCOUNT|account|Account)_?(ID|id|Id)?(\"|')?\\s*(:|=>|=)\\s*(\"|')?[0-9]{4}\\-?[0-9]{4}\\-?[0-9]{4}(\"|')?
[filter "lfs"]
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
[add.interactive]
useBuiltin = false # required for git 2.37.0
[delta]
navigate = true # use n and N to move between diff sections
light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
[diff]
tool = opendiff
[difftool "git-cola"]
cmd = git cola diff "$LOCAL" "$REMOTE"
trustExitCode = false