]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit5a7e52bed263c1dbc181ece54b73ee4318e79fca
treedf12b136643c70bbdd24bc0676efb064649ee760tree | snapshot
parentb98db1dd7002f52f3b61b7487dde7043e740ad8acommit | diff
parentc0c2a37ac2b9338c3a93340cbcbab69690da4df0commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.