-
Notifications
You must be signed in to change notification settings - Fork 2
/
Copy pathgitconfig
62 lines (62 loc) · 2.29 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
[alias]
bam = commit --amend --no-edit
fre = !git fetch origin main && git rebase origin/main
frep = !git fre && git push --force-with-lease
cob = "!f() { git fetch origin main && git checkout origin/main -b $1; }; f"
fopen = !git fre && git push -u cwlbraa HEAD && gh pr create --repo $(git remote get-url origin) --head cwlbraa:$(git rev-parse --abbrev-ref HEAD) --web
bopen = !git fre && git push -u origin HEAD && gh pr create --web
st = status
ci = commit -s
br = branch
co = checkout
cp = cherry-pick
sur = submodule update --init --recursive --jobs=7
lol = log --graph --decorate --pretty=oneline --abbrev-commit --all
lo = "!git --no-pager log --graph --decorate --pretty=oneline --abbrev-commit --all -n10"
rebase = rebase --autosquash
rio = "!git rebase --autosquash -i origin/$(git rev-parse --abbrev-ref HEAD)"
riom = rebase --autosquash -i origin/main
fu = commit --fixup
rl = log -g --date=iso --abbrev-commit --pretty=format:'%h %Cblue%gd%Creset %Creset%<(25,trunc)%ae %C(yellow)%<(80,trunc)%s ==> %<(80,trunc) %Cgreen%gs%Creset'
[user]
name = Connor Braa
email = [email protected]
signingKey = /Users/braa/.ssh/id_rsa.pub
[init]
templatedir = ~/.dotfiles/git_template
defaultBranch = main
[merge]
tool = intellij
conflictstyle = diff3
[mergetool "intellij"]
cmd = /Applications/IntelliJ\\ IDEA\\ CE.app/Contents/MacOS/idea merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED")
trustExitCode = true
[diff]
tool = intellij
colorMoved = default
[difftool "intellij"]
cmd = /Applications/IntelliJ\\ IDEA\\ CE.app/Contents/MacOS/idea diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE")
[core]
fsmonitor = true
untrackedCache = true
trustctime = false
[github]
user = cwlbraa
[url "[email protected]:"]
insteadOf = https://github.com
[push]
default = simple
autoSetupRemote = true
[credential]
helper = osxkeychain
[filter "lfs"]
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
[gpg]
format = ssh
[commit]
gpgsign = true
[gpg "ssh"]
allowedSignersFile = /Users/braa/.allowed_signers