| commit | e1068f0ad40f8e724513885e5a9ebb8548885e02 | |
| author | brian m. carlson <bk2204@github.com> | |
| Wed, 1 Nov 2023 19:24:19 +0000 (1 19:24 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 1 Nov 2023 23:51:40 +0000 (2 08:51 +0900) | ||
| tree | e9f1beca9c57b86d992d54598b78e1f6b748698b | treesnapshot (tar.gz zip) |
| parent | 8077612ea12e80b20e307e279916710b99fe6362 | commitdiff |
merge-file: add an option to process object IDs
git merge-file knows how to merge files on the file system already. It
would be helpful, however, to allow it to also merge single blobs.
Teach it an `--object-id` option which means that its arguments are
object IDs and not files to allow it to do so.
We handle the empty blob specially since read_mmblob doesn't read it
directly and otherwise users cannot specify an empty ancestor.
Signed-off-by: brian m. carlson <bk2204@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git merge-file knows how to merge files on the file system already. It
would be helpful, however, to allow it to also merge single blobs.
Teach it an `--object-id` option which means that its arguments are
object IDs and not files to allow it to do so.
We handle the empty blob specially since read_mmblob doesn't read it
directly and otherwise users cannot specify an empty ancestor.
Signed-off-by: brian m. carlson <bk2204@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-merge-file.txt | diffblobblamehistory | |
| builtin/merge-file.c | diffblobblamehistory | |
| t/t6403-merge-file.sh | diffblobblamehistory |