-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathgitconfig
71 lines (65 loc) · 1.93 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
[user]
name = Mike Busch
[github]
user = mikelikesbikes
[alias]
st = status
stb = status -sb
ci = commit -v
br = branch --sort=-committerdate
co = checkout
# fzf enabled co; shows git log to right
# co = !git for-each-ref --count=10 --sort=-committerdate --format='%(refname:short) (%(committerdate:relative))' refs/heads | fzf --reverse --nth=1 --preview 'git log --patch --color {1}...{1}~5' --bind 'enter:execute(git checkout {+1})+accept'
pr = pull --rebase
amend = commit --amend
am = commit --amend -C HEAD
ds = diff --staged
dw = diff
initialize = !git init && git commit --allow-empty -m 'initial commit'
cleanup = !git fetch origin && git branch --merged origin/master | grep -v master | xargs -n 1 git branch -d
stache = stash
praise = blame
whodoneit = blame
pom = push origin master
lg = log -p
prs = log --merges --grep 'Merge pull request' --date=local
lol = log --graph --decorate --oneline
lola = log --graph --decorate --oneline --all
shas = log --pretty=format:"%H"
sha = log --pretty=format:"%H" -1
gp = grep -C 2
bname = rev-parse --abbrev-ref HEAD
yolo = !git add --all . && git commit --no-verify --allow-empty -m 'yolo' && git push --force
# "aliases" to get autocomplete to work for pivotal_git_scripts
about = about
project = project
pair = pair
[core]
excludesfile = ~/.gitignore
[include]
path = ~/.gitconfig.local
[merge]
tool = vscode
[mergetool]
keepBackup = false
[mergetool "vscode"]
cmd = code --wait --new-window $MERGED
# [diff]
# tool = vscode
# [difftool "vscode"]
# cmd = code --wait --diff --new-window $LOCAL $REMOTE
[pager]
# log = diff-highlight | less
# show = diff-highlight | less
# diff = diff-highlight | less
# Use the OSX keychain to cache your github credentials
[credential]
helper = osxkeychain
[rerere]
enabled = true
[push]
default = current
[url "[email protected]:"]
insteadOf = https://github.com/
[init]
defaultBranch = main