Make git-pr set up branch for pulling (#570)

With these changes, the pr/nn branches created by git-pr also support `git pull` to get PR updates.
tj · Sep 11, 2016 · 241069d · 241069d
1 parent 93c2830
commit 241069d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/bin/git-pr b/bin/git-pr
@@ -16,4 +16,7 @@ else
   id=$1
   branch=pr/$id
 fi
-git fetch -fu $remote refs/pull/$id/head:$branch && git checkout $branch
+git fetch -fu $remote refs/pull/$id/head:$branch && \
+git checkout $branch && \
+git config --local --replace branch.\"$branch\".merge refs/pull/$id/head && \
+git config --local --replace branch.\"$branch\".remote $remote;