]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b98db1d c0c2a37)
Merge branch 'jz/apply-3way-cached'
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Apr 2021 20:36:01 +0000 (13:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Apr 2021 20:36:01 +0000 (13:36 -0700)
"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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.