From: František Dvořák <valtri@civ.zcu.cz>
Date: Thu, 7 Apr 2011 16:26:01 +0000 (+0200)
Subject: Cherry-pick one-by-one.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=4a8ba39dff782c650087fd04ea530bc126d943a2;p=convert.git

Cherry-pick one-by-one.
---

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)"