for x in $hashes; do
if git cherry-pick -x "$x"; then
- git log --oneline --no-walk "$x" >> PICK-GOOD
+ echo -n '++++ ' >&9
else
git cherry-pick --abort
- git log --oneline --no-walk "$x" >> PICK-BAD
+ echo -n '---- ' >&9
fi
-done
+ 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 $*)
-All commits:
+Commits included:
-$(git log --oneline --date-order --reverse --no-walk $hashes)
-
-Included:
-
-$(cat PICK-GOOD)
-
-Excluded:
-
-$(cat PICK-BAD)"
+$(cat PICK-LIST)"