forked from ryansully/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
51 lines (51 loc) · 1.4 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
[user]
name = Ryan Sullivan
email = [email protected]
[alias]
aa = add .
aliases = config --get-regexp alias
br = branch
ca = commit -a
ci = commit
co = checkout
cob = checkout -b
config-github = !bash ~/.dotfiles/bin/git-config-github
config-remove-github = config --remove-section github
cp = cherry-pick
depth = rev-parse --show-cdup
df = diff
dfa = !`git config diff.guitool` . &
lg = log --pretty=badass --graph
po = push origin
pom = push origin master
pr = pull --rebase --autostash
prom = !"git fetch -p && git rebase --autostash origin/master"
prs = !git pull --rebase && git submodule update --rebase
pu = !"git fetch origin -v; git fetch upstream -v; git merge upstream"
pur = !"git fetch origin -v; git fetch upstream -v; git rebase upstream"
purs = !"git fetch origin -v; git fetch upstream -v; git rebase upstream; git submodule update --rebase"
pushf = push --force-with-lease
root = !pwd
scrap = !git reset --hard && git clean -df
st = status
sync = !"git fetch upstream; git checkout master; git merge upstream/master"
undo = reset --soft HEAD^
unstage = reset HEAD
[color]
ui = true
[core]
editor = vim
excludesfile = ~/.gitignore_global
[diff]
guitool = meld
[instaweb]
httpd = lighttpd
[merge]
tool = meld
[mergetool]
keepBackup = false
[pretty]
badass = %C(yellow)%h%Creset%x09%Cgreen%d%Creset %s %C(bold blue)<%an>%Creset
[push]
default = current
followTags = true