diff options
author | hut <hut@lavabit.com> | 2010-03-31 05:15:26 +0200 |
---|---|---|
committer | hut <hut@lavabit.com> | 2010-03-31 05:15:26 +0200 |
commit | e2e31c3c84f0b7c95591a7d2244d7add345a442f (patch) | |
tree | 42d7602d8028e89ef2b444a04cd44dcc117f77c5 /doc | |
parent | 50fb6b25276c6256409cdda537c4204229681fe7 (diff) | |
download | ranger-e2e31c3c84f0b7c95591a7d2244d7add345a442f.tar.gz |
removed doc/pick.sh, pointless to have it there
Diffstat (limited to 'doc')
-rwxr-xr-x | doc/pick.sh | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/doc/pick.sh b/doc/pick.sh deleted file mode 100755 index e5f18da4..00000000 --- a/doc/pick.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -# I work on a branch (named hut) which contains commits -# that should not be part of the standard distribution. -# -# This script picks all the good commits from hut and -# adds them to the master branch. -# Bad commits are marked with a "custom:" at the beginning -# of the commit message. - -MASTER_BRANCH='master' -CUSTOM_BRANCH='hut' -ORIGINAL_BRANCH=`git branch 2>/dev/null|grep -e ^* | tr -d \*\ ` - -git checkout -m $MASTER_BRANCH - -while read -r hash tag rest; do - if [ $tag != 'custom:' ]; then - git cherry-pick $hash || exit 1 - fi -done < <(git log --oneline --no-color $MASTER_BRANCH..$CUSTOM_BRANCH | tac) - -git checkout -m $CUSTOM_BRANCH -git rebase $MASTER_BRANCH -git checkout -m $ORIGINAL_BRANCH |