diff --git a/git/gitconfig b/git/gitconfig index a238783..6bc9c02 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -3,6 +3,7 @@ ui = auto [alias] st = status + bi = bisect ci = commit co = checkout di = diff @@ -32,9 +33,10 @@ todo = grep --heading --break --ignore-case -e ' FIX: *' -e ' TODO: *' pr = "!source ~/.githelpers && get_pr" + prd = "!source ~/.githelpers && del_pr" [merge] tool = vimdiff - ff = false + ff = true [push] default = current [branch] diff --git a/git/githelpers b/git/githelpers index 75df5cc..f7682a0 100644 --- a/git/githelpers +++ b/git/githelpers @@ -53,4 +53,10 @@ get_pr() { : ${REMOTE:="upstream"} git fetch ${REMOTE} pull/${1}/head:pr/${1} git checkout pr/${1} -} \ No newline at end of file +} + +del_pr() { + BRANCH=`git rev-parse --abbrev-ref HEAD` + git checkout - && git branch -D ${BRANCH} +} +