development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 02:57:48 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'tk/subtree-merge-not-ff-only'

Browse source 
When "git subtree" wants to create a merge, it used "git merge" and
let it be affected by end-user's "merge.ff" configuration, which
has been corrected.

* tk/subtree-merge-not-ff-only:
  subtree: force merge commit
This commit is contained in:
Junio C Hamano 2022-02-17 16:25:04 -08:00
parent 45fe28c951 9158a3564a
commit 0ac270cf7c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/subtree/git-subtree.sh
View file

@ -975,10 +975,10 @@ cmd_merge () {
if test -n "$arg_addmerge_message"
then
git merge -Xsubtree="$arg_prefix" \
git merge --no-ff -Xsubtree="$arg_prefix" \
--message="$arg_addmerge_message" "$rev"
else
git merge -Xsubtree="$arg_prefix" $rev
git merge --no-ff -Xsubtree="$arg_prefix" $rev
fi
}