diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-02-26 18:10:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-26 18:10:24 -0800 |
| commit | cf47fb7ec7e183a1a1e521a540862fba3c2a89eb (patch) | |
| tree | becb14d7e876deff37756a158850463bd4b53fec /builtin/merge.c | |
| parent | b4385bf016d0d4b8e9bea6564e2d727082067f69 (diff) | |
| parent | 45b625142d8ca2218af1fb2b37216e58953e775d (diff) | |
Merge branch 'cp/apply-core-filemode'
"git apply" on a filesystem without filemode support have learned
to take a hint from what is in the index for the path, even when
not working with the "--index" or "--cached" option, when checking
the executable bit match what is required by the preimage in the
patch.
* cp/apply-core-filemode:
apply: code simplification
apply: correctly reverse patch's pre- and post-image mode bits
apply: ignore working tree filemode when !core.filemode
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions