From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 27 Jul 2014 22:14:21 +0000 (-0700)
Subject: Merge branch 'jk/rebase-am-fork-point'
X-Git-Tag: v2.1.0-rc0~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3dcacd7797082cb8e6f3c10970e18dd843433e3a

Merge branch 'jk/rebase-am-fork-point'

"git rebase --fork-point" did not filter out patch-identical
commits correctly.

* jk/rebase-am-fork-point:
rebase: omit patch-identical commits with --fork-point
rebase--am: use --cherry-pick instead of --ignore-if-in-upstream
---

3dcacd7797082cb8e6f3c10970e18dd843433e3a