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 /t/t6437-submodule-merge.sh | |
| parent | Merge branch 'kn/rev-list-missing-fix' (diff) | |
| parent | merge-file: add an option to process object IDs (diff) | |
| download | git-259e30d2bb4c74d853f5046aeb835c63b4ec88fd.tar.gz git-259e30d2bb4c74d853f5046aeb835c63b4ec88fd.zip | |
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 't/t6437-submodule-merge.sh')
0 files changed, 0 insertions, 0 deletions