+++ /dev/null
-#!/bin/sh
-set -x
-
-git clean -qdfx
-git stash
-git cherry-pick --quit
-
-hashes="$(git log --date-order ^HEAD --no-merges --format=%h --reverse "$@" | tr '\n' ' ')"
-tips="$( git log --date-order ^HEAD --no-merges --format=%h --no-walk "$@" | tr '\n' ' ')"
-
-pickList=''
-
-for x in $hashes; do
- if git cherry-pick -x "$x"; then
- prefixString='++++'
- else
- git cherry-pick --abort
- prefixString='----'
- fi
- pickList="$pickList
-$prefixString $(git log --oneline --no-walk "$x")"
-done
-
-if [ -n "$pickList" ]; then
- git merge -s ours $hashes -m"zygo: cherry-picked up to $*
-
-Commits included (++++) and excluded (----):
-$pickList"
-fi
+++ /dev/null
-#!/bin/sh
-set -x
-set -a
-ORIG_PATH="$PATH"
-PATH="$PWD/zygo:$ORIG_PATH"
-
-git remote update
-
-# Mine unmerged btrfs commits from upstreams
-# ...but don't pick up the ancient ones from 2009
-pick-kernel \
- linus/master \
- --remotes=btrfs-next/\* \
- --remotes=mason/\* \
- --after='now - 90 days' \
- -- \
- fs/btrfs \
-
-KCONFIG_NOTIMESTAMP=1 make oldconfig prepare modules_prepare -j
-make SUBDIRS=fs/btrfs -j
-date