summary refs log tree commit diff stats
path: root/doc/pick.sh
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-04-07 15:50:08 +0200
committerhut <hut@lavabit.com>2010-04-07 15:50:08 +0200
commit8d89c6f3a7cf6b0c8abc2ff68ecc7201ac08e872 (patch)
tree610dd3acfdac10ebe1d766a779897207ea6dfb33 /doc/pick.sh
parent55435343b142c424619e3072475ca8b3366d109c (diff)
parentf45f9734d2ff9fd6b68ff6c879d5b07b0e5c7d02 (diff)
downloadranger-8d89c6f3a7cf6b0c8abc2ff68ecc7201ac08e872.tar.gz
Merge branch 'devel' into newkey
Conflicts:
	ranger/core/actions.py
	ranger/defaults/keys.py
	ranger/ext/direction.py
	ranger/gui/ui.py
	ranger/gui/widgets/browserview.py
	ranger/gui/widgets/pager.py
Diffstat (limited to 'doc/pick.sh')
-rwxr-xr-xdoc/pick.sh25
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