how to keeping track of cherry-pick?

Hi,

We are changing from subversion to git. We used to merge revisions from
development branch to stable with svnmerge.py.

svnmerge.py can give us a list of revisions available for merging. The
result is similar to "git log --chery-pick master..dev" The difference
is that svnmerge.py operates on revision-numbers, and --chery-pick looks
at the diffs. The result of that is that when we get a conflict when a
patch is cherry-picked, it will still show up as "available" when I run
"git log --cherry-pick master..dev"

svnmerge.py can also mark revisions as blocked, and will not show up in
the list of available revisions.

How can I keep track of cherry-picked patches, and mark patches as
"blocked", in the same (or similar) way as I did in subversion with
svnmerge.py?

-- 
Knut Olav Bøhmer