diff options
| author | hut <hut@lavabit.com> | 2010-02-05 06:08:36 +0100 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-02-05 06:08:41 +0100 |
| commit | 95b7c7b6b4c2b12ffc03d1278722f463d019d02b (patch) | |
| tree | b9e924a5ec27a6e0b0153629475eff46fc1eab5a /doc/pick.sh | |
| parent | 03b4aefab11192a20d541963d12b61c09738d6d2 (diff) | |
| download | ranger-95b7c7b6b4c2b12ffc03d1278722f463d019d02b.tar.gz | |
pick.sh: added -m to checkout commads
Diffstat (limited to 'doc/pick.sh')
| -rwxr-xr-x | doc/pick.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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 |