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 /t/chainlint/if-in-loop.expect | |
| parent | Merge branch 'km/help-prompt-fix' (diff) | |
| parent | merge: allow to pretend a merge is made into a different branch (diff) | |
| download | tgif-bb14cfdfd74c37f4319405eaebce0691c5b51db0.tar.xz | |
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 't/chainlint/if-in-loop.expect')
0 files changed, 0 insertions, 0 deletions