/
.gitconfig
74 lines (73 loc) · 2.45 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
[user]
name = Chris West (Faux)
email = git@goeswhere.com
signingKey = FA32D9E7E0BB52143267D943B3D30B2CE0437417
[core]
logAllRefUpdates = on
[alias]
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
lgd = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --abbrev-commit
co = checkout
fa = fetch --all
fe = fetch
feob = "fetch origin +refs/heads/*:refs/heads/* --prune"
rc = rebase --continue
rs = rebase --skip
ri = rebase --interactive
ra = rebase --abort
rem = rebase origin/master
rim = rebase --interactive origin/master
rer = rebase origin/REMOTE_HEAD
rir = rebase --interactive origin/REMOTE_HEAD
sl = stash list
st = status
d = diff
di = diff
aa = add -A
a = add
ci = commit
rh = reset --hard
rp = repack -adf
pur = pull --rebase
pf = push --force-with-lease
cam = commit -am
fixup = commit --amend -CHEAD
mergeback = "!f() { git update-ref refs/heads/master -m \"Force-merging master with current branch $(git symbolic-ref HEAD)\" $(echo \"$1\" | git commit-tree \"HEAD^{tree}\" -p refs/heads/master -p HEAD); git lg master HEAD -4 | cat; }; f"
resetother = "!f(){ git update-ref refs/heads/$1 $2; git lg -4 $1 | cat; }; f"
po = push origin
cm = commit -m
bf = branch -f
bv = branch -vv
cp = cherry-pick
desc = "!f() { if [ $# = 0 ]; then S=HEAD; else S=\"$1\"; fi; git describe --contains $S 2> /dev/null || git describe --tags $S; }; f"
pokeolite = !git ls-remote origin | grep -w refs/heads/poke && git push origin :poke || git push origin master:poke
resolved = "!f() { if [ $# = 0 ]; then S=HEAD; else S=\"$1\"; fi; if git describe --contains $S >/dev/null 2> /dev/null; then echo Fixed in $(git describe --contains $S | cut -d~ -f1 ).; else echo Will be fixed in the next release after $(git describe --tags $S | cut -d- -f1).; fi }; f"
sf = svn fetch
sr = svn rebase
sd = svn dcommit
ru = remote update
[color]
branch = auto
diff = auto
interactive = auto
status = auto
[rebase]
autosquash = true
[url "https://github.com/"]
insteadOf = "gh:"
insteadOf = "github:"
[url "https://github.com/FauxFaux/"]
insteadOf = "ghf:"
[url "ssh://git@github.com/snyk/"]
insteadOf = https://github.com/snyk/
[url "git@github.com:"]
pushInsteadOf = "https://github.com/"
[push]
default = current
[core "include"]
path = ~/.gitconfig-local
[pull]
rebase = true
[commit]
[init]
defaultBranch = main