From 95b7c7b6b4c2b12ffc03d1278722f463d019d02b Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Fri, 5 Feb 2010 06:08:36 +0100
Subject: pick.sh: added -m to checkout commads

---
 doc/pick.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/pick.sh b/doc/pick.sh
index baa41c46..348ae6f3 100755
--- a/doc/pick.sh
+++ b/doc/pick.sh
@@ -12,7 +12,7 @@ MASTER_BRANCH='master'
 CUSTOM_BRANCH='hut'
 ORIGINAL_BRANCH=`git branch 2>/dev/null|grep -e ^* | tr -d \*\ `
 
-git checkout $MASTER_BRANCH
+git checkout -m $MASTER_BRANCH
 
 while read -r hash tag rest; do
 	if [ $tag != 'custom:' ]; then
@@ -20,6 +20,6 @@ while read -r hash tag rest; do
 	fi
 done < <(git log --oneline --no-color $MASTER_BRANCH..$CUSTOM_BRANCH)
 
-git checkout $CUSTOM_BRANCH
+git checkout -m $CUSTOM_BRANCH
 git rebase $MASTER_BRANCH
-git checkout $ORIGINAL_BRANCH
+git checkout -m $ORIGINAL_BRANCH
-- 
cgit 1.4.1-2-gfad0