diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-08 11:04:01 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-08 11:04:01 +0900 |
| commit | 259e30d2bb4c74d853f5046aeb835c63b4ec88fd (patch) | |
| tree | 2a58afc8a0986e2980ac62ee74186043ca5a0008 /builtin/commit-graph.c | |
| parent | 57e216d03d3f6630771530f9c3feb0aa7f8aaad4 (diff) | |
| parent | e1068f0ad40f8e724513885e5a9ebb8548885e02 (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
Diffstat (limited to 'builtin/commit-graph.c')
0 files changed, 0 insertions, 0 deletions