From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Aug 2012 21:49:29 +0000 (-0700)
Subject: Merge branch 'mz/cherry-code-cleanup'
X-Git-Tag: v1.8.0-rc0~126
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8748f3c52ec414932dbf6ac3a22d87d5c881a612;p=git.git

Merge branch 'mz/cherry-code-cleanup'

Minor code clean-up on the cherry-pick codepath.

* mz/cherry-code-cleanup:
  cherry: remove redundant check for merge commit
  cherry: don't set ignored rev_info options
  remove unnecessary parameter from get_patch_ids()
---

8748f3c52ec414932dbf6ac3a22d87d5c881a612