]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit259e30d2bb4c74d853f5046aeb835c63b4ec88fd
tree2a58afc8a0986e2980ac62ee74186043ca5a0008tree | snapshot
parent57e216d03d3f6630771530f9c3feb0aa7f8aaad4commit | diff
parente1068f0ad40f8e724513885e5a9ebb8548885e02commit | diff
Merge branch 'bc/merge-file-object-input'

"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
Unnamed repository; edit this file 'description' to name the repository.