git/Documentation
Alex Henrie 57f583c748 apply: support --ours, --theirs, and --union for three-way merges
--ours, --theirs, and --union are already supported in `git merge-file`
for automatically resolving conflicts in favor of one version or the
other, instead of leaving conflict markers in the file. Support them in
`git apply -3` as well because the two commands do the same kind of
file-level merges.

In case in the future --ours, --theirs, and --union gain a meaning
outside of three-way-merges, they do not imply --3way but rather must be
specified alongside it.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-09-09 10:07:24 -07:00
..
2024-09-06 10:38:52 -07:00
2024-07-23 11:02:52 -07:00
2024-06-17 15:55:56 -07:00
2023-11-26 10:07:05 +09:00
2023-06-12 13:52:51 -07:00
2024-08-16 09:46:25 -07:00
2023-10-09 12:06:29 -07:00
2023-11-26 10:07:05 +09:00
2023-12-26 11:06:55 -08:00
2024-02-21 10:02:55 -08:00
2023-10-09 12:06:29 -07:00
2023-06-12 13:52:51 -07:00
2023-06-12 13:52:51 -07:00
2024-01-02 13:51:30 -08:00
2024-05-07 10:06:03 -07:00
2024-04-19 12:38:50 +02:00
2023-12-14 14:38:07 -08:00
2023-12-26 11:06:55 -08:00
2019-05-07 13:04:48 +09:00
2024-08-21 12:02:24 -07:00
2023-08-28 09:16:06 -07:00
2023-11-26 10:07:05 +09:00