From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Jul 2018 19:20:32 +0000 (-0700)
Subject: Merge branch 'mb/filter-branch-optim'
X-Git-Tag: v2.19.0-rc0~152
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=676c7e50b10f1fbb2ce06e46260f15f3a20679f7;p=thirdparty%2Fgit.git

Merge branch 'mb/filter-branch-optim'

"git filter-branch" when used with the "--state-branch" option
still attempted to rewrite the commits whose filtered result is
known from the previous attempt (which is recorded on the state
branch); the command has been corrected not to waste cycles doing
so.

* mb/filter-branch-optim:
  filter-branch: skip commits present on --state-branch
---

676c7e50b10f1fbb2ce06e46260f15f3a20679f7