]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1f41bb 57f583c)
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)
"git apply --3way" learned to take "--ours" and other options.

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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.