-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
76 lines (61 loc) · 1.87 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
[alias]
co = checkout
st = status -sb
#log aliases
lol = log --decorate --pretty=oneline --abbrev-commit -n 25
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
lol-merge = log --graph --decorate --pretty=oneline --abbrev-commit --all --simplify-merges --merges
sw = !git checkout $(git branch -a --format '%(refname:short)' | sed 's~origin/~~' | sort | uniq | fzf)
# rb = !git for-each-ref --sort=-committerdate refs/heads/ --format='%(refname:short) %(objectname:short) %(committerdate:format:%F)' | column -t
fza = "!git ls-files -m -o --exclude-standard | fzf -m --print0 | xargs -0 git add"
gone = "!f() { git fetch --all --prune; git branch -vv | awk '/: gone]/{print $1}' | xargs git branch -D; }; f"
#quality of life aliases
new = checkout -t origin/master -b
unstage = reset -q HEAD --
discard = checkout --
forget = checkout HEAD~1 --
continue = rebase --continue
delete-last-commit = reset --hard HEAD~1
uncommit = reset HEAD~
amend = commit --amend --no-edit
nevermind = !git reset --hard HEAD && git clean -d -f
branches = branch -a
remotes = remote -v
tags = tag
stashes = stash list
delete-commit = reset --hard HEAD~1
undo-commit = reset --soft HEAD~1
reset-me = "!git reset me/$(git branch-name) --hard"
force-push = "push --force-with-lease"
# wwwwwwork
ci-kick = "commit -m 'Kick-off CI (empty commit)' --allow-empty"
[color]
branch = auto
diff = auto
interactive = auto
status = auto
ui = true
[core]
autocrlf = input
excludesFile = ~/.gitignore
pager = delta
editor = nvim
[interative]
diffFilter = delta --color-only
[delta]
navigate = true
line-numbers = true
[merge]
conflictstyle = diff3
[diff]
colorMoved = default
[user]
email = [email protected]
name = JD Cantrell
[push]
default = current
[rerere]
enabled = true
autoupdate = true
[init]
defaultBranch = main