w33ble/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some additional git helpers

Browse Source
This commit is contained in:
Joe Fleming
2014-11-05 11:15:02 -07:00
parent 9143c5cc71
commit a10dd6785a
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git/gitconfig
View File

@@ -3,6 +3,7 @@
ui = auto ui = auto
[alias] [alias]
st = status st = status
bi = bisect
ci = commit ci = commit
co = checkout co = checkout
di = diff di = diff
@@ -32,9 +33,10 @@
todo = grep --heading --break --ignore-case -e ' FIX: *' -e ' TODO: *' todo = grep --heading --break --ignore-case -e ' FIX: *' -e ' TODO: *'
pr = "!source ~/.githelpers && get_pr" pr = "!source ~/.githelpers && get_pr"
prd = "!source ~/.githelpers && del_pr"
[merge] [merge]
tool = vimdiff tool = vimdiff
ff = false ff = true
[push] [push]
default = current default = current
[branch] [branch]

8
git/githelpers
View File

@@ -53,4 +53,10 @@ get_pr() {
: ${REMOTE:="upstream"} : ${REMOTE:="upstream"}
git fetch ${REMOTE} pull/${1}/head:pr/${1} git fetch ${REMOTE} pull/${1}/head:pr/${1}
git checkout pr/${1} git checkout pr/${1}
} }
del_pr() {
BRANCH=`git rev-parse --abbrev-ref HEAD`
git checkout - && git branch -D ${BRANCH}
}