]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ah/apply-3way-ours'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Sep 2024 21:22:53 +0000 (14:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Sep 2024 21:22:54 +0000 (14:22 -0700)
commit6e2a18cb049e35e4a13847c4b720c9d5f1dce5b9
tree9dc645e657a95dbd805e5869a0b99a27ff357399
parentc1f41bbe1a23aabdf9026c735dac58c181487e94
parent57f583c748fdc65c16d1c24a7060a758850cb4a2
Merge branch 'ah/apply-3way-ours'

"git apply --3way" learned to take "--ours" and other options.

* ah/apply-3way-ours:
  apply: support --ours, --theirs, and --union for three-way merges