From 8111b8e97219ef289b25a296a2775c8975b01dc9 Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Thu, 4 Feb 2010 02:45:30 +0100
Subject: added doc/pick.sh

---
 doc/pick.sh | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100755 doc/pick.sh

diff --git a/doc/pick.sh b/doc/pick.sh
new file mode 100755
index 00000000..fb9da83b
--- /dev/null
+++ b/doc/pick.sh
@@ -0,0 +1,24 @@
+#!/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.
+
+BRANCH=`git branch 2>/dev/null|grep -e ^* | tr -d \*\ `
+
+git checkout master
+
+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..hut)
+
+git checkout hut
+git rebase master
+
+git checkout $BRANCH
-- 
cgit 1.4.1-2-gfad0