]> git.hungrycats.org Git - linux/commitdiff
zygo: pick-kernel from zygo-3.18.8-zb64-btrfs zygo-3.19.1-zb64
authorZygo Blaxell <zblaxell@waya.furryterror.org>
Sat, 7 Mar 2015 17:23:14 +0000 (12:23 -0500)
committerZygo Blaxell <zblaxell@waya.furryterror.org>
Sat, 7 Mar 2015 17:23:14 +0000 (12:23 -0500)
zygo/pick-kernel [new file with mode: 0755]

diff --git a/zygo/pick-kernel b/zygo/pick-kernel
new file mode 100755 (executable)
index 0000000..6779711
--- /dev/null
@@ -0,0 +1,24 @@
+#!/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
+               echo -n '++++ ' >&9
+       else
+               git cherry-pick --abort
+               echo -n '---- ' >&9
+       fi
+       git log --oneline --no-walk "$x" >&9
+done 9> PICK-LIST
+
+git merge -s ours "$x" -m"zygo: cherry-picked up to $x (extra args $*)
+
+Commits included:
+
+$(cat PICK-LIST)"