Permalink
Browse files

fix github-init merge branch name

  • Loading branch information...
1 parent 578b3d8 commit 98af52b4e1d385d8f6f7b53c21139c93e8a33382 @ryanfb ryanfb committed with Bryce Kerley Aug 15, 2008
Showing with 1 addition and 1 deletion.
  1. +1 −1 06_git
View
2 06_git
@@ -26,7 +26,7 @@ if [[ -x `which git` ]]; then
}
function github-init () {
git config branch.$(git-branch-name).remote origin
- git config branch.$(git-branch-name).merge refs/heads/master
+ git config branch.$(git-branch-name).merge refs/heads/$(git-branch-name)
}
fi

0 comments on commit 98af52b

Please sign in to comment.