diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-04-15 23:36:01 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-15 23:36:01 +0300 |
| commit | 5a7e52bed263c1dbc181ece54b73ee4318e79fca (patch) | |
| tree | df12b136643c70bbdd24bc0676efb064649ee760 /negotiator | |
| parent | b98db1dd7002f52f3b61b7487dde7043e740ad8a (diff) | |
| parent | c0c2a37ac2b9338c3a93340cbcbab69690da4df0 (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
Diffstat (limited to 'negotiator')
0 files changed, 0 insertions, 0 deletions