]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 57e216d e1068f0)
Merge branch 'bc/merge-file-object-input'
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Nov 2023 02:04:01 +0000 (11:04 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Nov 2023 02:04:01 +0000 (11:04 +0900)
"git merge-file" learns a mode to read three contents to be merged
from blob objects.

* bc/merge-file-object-input:
  merge-file: add an option to process object IDs
  git-merge-file doc: drop "-file" from argument placeholders


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