| commit | bb14cfdfd74c37f4319405eaebce0691c5b51db0 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Jan 2022 22:01:29 +0000 (5 14:01 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Jan 2022 22:01:30 +0000 (5 14:01 -0800) | ||
| tree | ff830f599931dd6952e354ffd1ba0b2bedea8a76 | treesnapshot (tar.gz zip) |
| parent | a16548404789771fd3ee69f301893a08ef268bb2 | commitdiff |
| parent | bd2bc94252a47443e19d366f8cc9626d4f92df7a | commitdiff |
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
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
| Documentation/git-merge.txt | diff1 | diff2 | blobhistory |
| builtin/merge.c | diff1 | diff2 | blobhistory |
| fmt-merge-msg.c | diff1 | diff2 | blobhistory |
| t/t6200-fmt-merge-msg.sh | diff1 | diff2 | blobhistory |