diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-01-05 14:01:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-05 14:01:30 -0800 |
| commit | bb14cfdfd74c37f4319405eaebce0691c5b51db0 (patch) | |
| tree | ff830f599931dd6952e354ffd1ba0b2bedea8a76 /reftable/test_framework.c | |
| parent | a16548404789771fd3ee69f301893a08ef268bb2 (diff) | |
| parent | bd2bc94252a47443e19d366f8cc9626d4f92df7a (diff) | |
Merge branch 'jc/merge-detached-head-name'
The default merge message prepared by "git merge" records the name
of the current branch; the name can be overridden with a new option
to allow users to pretend a merge is made on a different branch.
* jc/merge-detached-head-name:
merge: allow to pretend a merge is made into a different branch
Diffstat (limited to 'reftable/test_framework.c')
0 files changed, 0 insertions, 0 deletions