-
Notifications
You must be signed in to change notification settings - Fork 1
Expand file tree
/
Copy pathgitconfig
More file actions
82 lines (81 loc) · 2.19 KB
/
Copy pathgitconfig
File metadata and controls
82 lines (81 loc) · 2.19 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
[user]
name = Rob Christie
email = rob.christie@kajabi.com
signingkey = 306ABB80C368E645
[github]
user = rwc9u
[alias]
co = checkout
st = status
br = branch
w = whatchanged
ribbon = tag --force _ribbon origin/master
catchup = log --patch --reverse --topo-order _ribbon..origin/master
daily-report = !git --no-pager log --author=Rob --since='yesterday' --format='%s' --no-merges
repo-stats = shortlog -s -n --all
find-merge = "!sh -c 'commit=$0 && branch=${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'"
show-merge = "!sh -c 'merge=$(git find-merge $0 $1) && [ -n \"$merge\" ] && git show $merge'"
lol = log --graph --decorate --pretty=oneline --abbrev-commit --all
s = status --short --branch
l = log --graph --pretty='%C(yellow)%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'
ll = log --parents
ld = log -p --parents
who = shortlog -s
d = diff --color
ds = diff --color --stat
dw = diff --color-words
a = add
aa = add --all
aap = add --all -p
c = commit
cm = commit -m
k = checkout
kb = checkout -b
b = branch --sort=-committerdate -v
bb = branch -a -v
bd = branch -d
bdd = branch -D
m = merge
p = push
pt = push --tags
u = pull --ff-only
f = fetch
rb = rebase
rbf = rebase --fork-point
rbo = rebase --onto
chp = cherry-pick
pn = remote prune origin
[apply]
whitespace = nowarn
[color]
diff = auto
status = auto
branch = auto
interactive = auto
ui = true
pager = true
[merge]
summary = true
[pull]
rebase = true
[core]
excludesfile = /Users/rob.christie/.gitignore_global
fsmonitor = true
untrackedCache = true
[push]
default = simple
autoSetupRemote = true
followTags = true
[commit]
template = /Users/rob.christie/.stCommitMsg
gpgsign = true
[filter "lfs"]
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
[init]
defaultBranch = main
[safe]
directory = /Users/rob.christie/dev/kajabi-products
directory = /workspace