-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitconfig
More file actions
115 lines (115 loc) · 3.4 KB
/
Copy path.gitconfig
File metadata and controls
115 lines (115 loc) · 3.4 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
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
[user]
name = micxer
email = micxer@micxer.de
[core]
editor = vim
excludesFile = ~/.gitignore
[alias]
cp = cherry-pick
ci = commit
cfx = !git log -n 50 --pretty=format:\"%h %s\" --no-merges | fzf | cut -c -7 | xargs -o git commit --fixup
co = checkout
sw = switch
swm = switch main
swb = switch -
com = checkout main
st = status
br = branch
ps = push
pst = push --tags
# use this and avoid psff
psf = push --force-with-lease
psff = push --force
pl = pull
pr = fetch origin --prune --progress
rbi = rebase --interactive
rbm = rebase main
rbim = rebase --interactive main
rbum = !git fetch upstream && git rebase --onto upstream/main main
# fixup messed up commit
rbfx = rebase --interactive HEAD~2
rbas = rebase --autosquash main
# selectively add changes from the whole changeset
ap = add --patch
# show staged changes
dc = diff --cached
lg = log
# word-diff
wdiff = diff --color-words --word-diff --word-diff-regex=[^[:space:]]|([[:alnum:]]|UTF_8_GUARD)+
# log including diffs
lg = log -p --pretty=fuller --abbrev-commit
# only changed files/stats
lgg = log --pretty=fuller --abbrev-commit --stat
# oneliner log
lgod = log --oneline --decorate
# show unpushed commits
ups = log --graph --date-order --pretty=tformat:\"%C(yellow)%h%Creset %C(magenta)%aE %ai%Creset %C(green bold)%d%Creset%n %s\" --boundary --all --not --remotes --tags
# show tags sorted by date
tbyd = for-each-ref --sort=creatordate --format '%(refname) %(creatordate)' refs/tags
# show local branches without remote counterpart
locbr = "!git branch -vv | awk '/: gone]/{print;next} !/[[]origin\\//{print $0 \" [local]\"}' | sed $'s/: gone]/: \\e[31mgone\\e[0m]/; s/\\\\[local]/[\\e[33mlocal\\e[0m]/'"
staash = stash --all
[color]
ui = true
interactive = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold reverse
new = green bold reverse
[color "status"]
added = yellow
changed = green
untracked = cyan
[diff]
wsErrorHighlight = all
tool = icdiff
[push]
default = current
[pull]
rebase = true
[branch]
autosetuprebase = always
sort = -committerdate
[merge]
ff = only
tool = icdiff
[help]
autocorrect = 20
[commit]
gpgsign = true
[gpg]
program = /usr/local/MacGPG2/bin/gpg2
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[init]
defaultBranch = main
[secrets]
providers = git secrets --aws-provider
patterns = (A3T[A-Z0-9]|AKIA|AGPA|AIDA|AROA|AIPA|ANPA|ANVA|ASIA)[A-Z0-9]{16}
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}(\"|')?
allowed = AKIAIOSFODNN7EXAMPLE
allowed = wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
[difftool]
prompt = false
[rerere]
enabled = true
autoUpdate = true
[includeIf "gitdir:~/Development/oss/"]
path = ~/Development/oss/.gitconfig
[includeIf "gitdir:~/Development/work/"]
path = ~/Development/work/.gitconfig
[column]
ui = auto
[fetch]
prune = true
[tag]
gpgsign = true