From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Apr 2021 20:36:01 +0000 (-0700)
Subject: Merge branch 'jz/apply-3way-cached'
X-Git-Tag: v2.32.0-rc0~80
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a7e52bed263c1dbc181ece54b73ee4318e79fca;p=thirdparty%2Fgit.git

Merge branch 'jz/apply-3way-cached'

"git apply" now takes "--3way" and "--cached" at the same time, and
work and record results only in the index.

* jz/apply-3way-cached:
  git-apply: allow simultaneous --cached and --3way options
---

5a7e52bed263c1dbc181ece54b73ee4318e79fca