-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
81 lines (81 loc) · 2.31 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
[user]
name=Dani Meier
signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFQp83w7NoE8YvydS4yvMsve+Vd0UxaF+rb8H2kpn0Nr
[includeIf "gitdir:~/dev-sb/"]
path = .gitconfig-sb
[includeIf "gitdir:~/dev/"]
path = .gitconfig-flyingdot
[push]
default = simple
autoSetupRemote = true
[mergetool]
keepBackup = false
keeptemporaries = false
keepbackups = false
prompt = false
trustexitcode = false
[alias]
orphanl = !git log --pretty=oneline --abbrev-commit --graph --decorate `git reflog | cut -d ' ' -f 1`
co = checkout
ec = config --global -e
up = !git pull --rebase --prune $@ && git submodule update --init --recursive
cob = checkout -b
c = !git add -A && git commit
ci = commit
cm = !git add -A && git commit -m
save = !git add -A && git commit -m 'SAVEPOINT'
wip = !git add -u && git commit -m "WIP"
undo = reset HEAD~1 --mixed
amend = commit -a --amend
amendpush = !git commit -a --amend --no-edit && git push -f
wipe = !git add -A && git commit -qm 'WIPE SAVEPOINT' && git reset HEAD~1 --hard
bclean = "!f() { git branch --merged ${1-master} | grep -v " ${1-master}$" | xargs -r git branch -d; }; f"
bdone = "!f() { git checkout ${1-master} && git up && git bclean ${1-master}; }; f"
lol = log --oneline
l = !git log --oneline -10
ll = !git log --oneline -30
lm = !git log --format=%B -n 1
upco = !git co develop && git up
upcom = !git co main && git up
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %Cblue<%an>%Creset' --abbrev-commit --date=relative --all
last = log -1 --stat
st = status -sb
unstage = reset HEAD --
compare = log --left-right --graph --cherry-pick --oneline
[core]
commentChar = `
autocrlf = input
trustctime = false
editor = nvim
filemode = false
[credential]
helper = wincred
[log]
date = relative
[gui]
recentrepo = D:/dev/mycustomer
[color]
ui = true
[diff]
tool = bc3
[merge]
tool = bc3
[mergetool "bc3"]
trustExitCode = true
[init]
templatedir = /Users/dani/.git-templates
defaultBranch = main
[rerere]
enabled = true
[difftool "bc3"]
trustExitCode = true
[gpg]
format = ssh
[gpg "ssh"]
program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
[commit]
gpgsign = true
[worktree]
guessRemote = true