> > or if we use cherry-pick model > > 0---0---0---0---*---*---* master > \ > 0---0---*---*---* release > > but in this case , how do we do it in script? > I mean, how do we know we need to start cherry-pick from the 1st '*' > to the 3rd '*' in master > > more precisely , if A to E represents the commit SHA1 > > 0---0---0---0---A---B---C---D---E master > \ > 0---0---A'---B'---C' release > > the 3 cherry-picks A' B' C' on release branch won't have the same SHA1 > for A B C in master > how can we know effectively we need to start cherry-pick from C to E > on master > You can start by using git log --cherry-pick .... which compares commits based on their patch contents, not just the SHA1. You can use a moving tag (say APPLIED) to keep track of till what point on master you have done the necessary cherry-picks, and then something like this may work for you: git log --cherry-pick release..master ^APPLIED Thanks Antriksh -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html