-
Notifications
You must be signed in to change notification settings - Fork 2
/
.gitconfig
73 lines (73 loc) · 2.44 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
[user]
name = Danielle Lancashire
email = [email protected]
signingkey = F3DDF91B
[core]
excludesfile = ~/.config/git/gitignore
[mergetool]
keepBackup = false
prompt = false
[alias]
a = add
adeleted = !sh -c 'git rm `git ls-files --deleted`'
ap = add -p
auntracked = !sh -c 'git add `git ls-files --others --exclude-standard`'
ba = branch -a
c = clone --recursive
cb = !sh -c 'git checkout -b $1 && git push -u origin $1' -
co = checkout
com = commit --verbose
cop = !sh -c 'git branch | cut -c 3- | selecta 2>/dev/null | xargs git checkout'
ctags = !.git/hooks/ctags
d = diff --ignore-submodules
dc = diff --cached
dt = difftool
dtc = difftool --cached
detach = !sh -c 'git checkout $(git rev-parse ${1:-HEAD})' --
l = log -5 --topo-order --graph --pretty='format:%Cgreen%h%Creset %s%Cred%d%Creset %C(yellow bold)(%an)%Creset'
lb = !sh -c 'git log -$(git rev-list --count HEAD ^${1:-master}) --topo-order --graph --date=relative --pretty=format:%Cgreen%h%Creset\\ %s%Cred%d%Creset\\ %C\\(yellow\\ bold\\)\\(%an\\)%Creset' $@
last = diff HEAD^ HEAD
lastk = difftool --tool=Kaleidoscope HEAD^ HEAD
pul = pull
punch = push --force-with-lease
pummel = push --force
r = reflog -5
ra = rebase --abort
rc = rebase --continue
rma = rebase master
rmi = rebase master -i
rv = remote -v
s = status -b --porcelain
sub = submodule update --init --recursive
subu = submodule foreach git pull origin master
undo = reset --soft HEAD^
fixup = commit --amend --no-edit
current = rev-parse --abbrev-ref HEAD
default-branch = "!git branch --sort=-refname | grep -o -m1 '\\b\\(main\\|master\\|dev\\)\\b'"
sign-branch = rebase --exec 'git commit --amend --no-edit -n --sign -S' -i origin/main
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[fetch]
prune = false
[branch]
autosetupmerge = true
sort=-committerdate # Sort branches by last commit date, descending.
[rerere]
enabled = true
[push]
default = simple
[commit]
gpgsign = true
[mailmap]
file = ~/.config/git/mailmap
[log]
mailmap = true
[pull]
rebase = true
[init]
defaultBranch = main
[url "ssh://[email protected]/"]
insteadOf = https://github.com/