From: Zygo Blaxell <zblaxell@serenity.furryterror.org>
Date: Wed, 11 Feb 2015 17:47:12 +0000 (-0500)
Subject: zygo: first revision of pick-kernel
X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a57293e45482ba825ea61936d3367f0c905c310;p=linux

zygo: first revision of pick-kernel
---

diff --git a/zygo/pick-kernel b/zygo/pick-kernel
new file mode 100755
index 000000000000..7c73d966c148
--- /dev/null
+++ b/zygo/pick-kernel
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+set -x
+git clean -dfx
+git stash
+git cherry-pick --quit
+
+hashes="$(git log --date-order ^HEAD --no-merges --format=%h --reverse "$@")"
+
+for x in $hashes; do
+	if git cherry-pick -x "$x"; then
+		git log --oneline --no-walk "$x" >> PICK-GOOD
+	else
+		git cherry-pick --abort
+		git log --oneline --no-walk "$x" >> PICK-BAD
+	fi
+done
+
+git merge -s ours "$x" -m"zygo: cherry-picked up to $x (extra args $@)
+
+All commits:
+
+$(git log --oneline --date-order --reverse --no-walk $hashes)
+
+Included:
+
+$(cat PICK-GOOD)
+
+Excluded:
+
+$(cat PICK-BAD)"