From 4a8ba39dff782c650087fd04ea530bc126d943a2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 7 Apr 2011 18:26:01 +0200 Subject: [PATCH] Cherry-pick one-by-one. --- cvs2git-inc.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cvs2git-inc.sh b/cvs2git-inc.sh index ee9e478..34ea9d2 100755 --- a/cvs2git-inc.sh +++ b/cvs2git-inc.sh @@ -63,8 +63,10 @@ branch_workflow a0a362418b99167f40d1328ea8a934b147372329 master 86d4a33945bc77fe59369840a54d9d8a7c9e3ef3" | while read branch start; do echo "$start..cvssync/$branch" git checkout $branch || break - c=`git log --format=%H $start..cvssync/$branch --` - [ -z "$c" ] || git cherry-pick $c + cl=`git log --format=%H $start..cvssync/$branch -- | grep -v '\(e6919c\|1f39df\|1f39df\)'` + for c in $cl; do + git cherry-pick $c + done done echo "Really push? (CTRL-C for quit)" -- 1.8.2.3