forked from thoughtbot/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
36 lines (34 loc) · 1.04 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
[user]
name = Zhuo Huang
email = [email protected]
# DO NOT EDIT BELOW THIS LINE
[push]
default = upstream
[color]
ui = auto
[alias]
aa = add --all
ap = add --patch
ca = commit --amend
ci = commit -v
co = checkout
sm = submodule
create-branch = !sh -c 'git push origin HEAD:refs/heads/$1 && git fetch origin && git branch --track $1 origin/$1 && cd . && git checkout $1' -
delete-branch = !sh -c 'git push origin :refs/heads/$1 && git remote prune origin && git branch -D $1' -
merge-branch = !git checkout master && git merge @{-1}
pr = !hub pull-request
lg = log --graph
br = branch
st = status
up = !git fetch origin && git rebase origin/master
# up for upstream
pu = !git fetch upstream && git rebase upstream/master # this modifies commit history
mpu = !"git fetch origin -v; git fetch upstream -v; git merge upstream/master"
find = log --pretty=\"format:%Cgreen%H %Cblue%s\" --name-status --grep
[core]
excludesfile = ~/.gitignore
autocrlf = input
[merge]
ff = only
[include]
path = .gitconfig.local