diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-17 16:25:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-17 16:25:04 -0800 |
| commit | 0ac270cf7c0d77b91670bda843578e943f5790bd (patch) | |
| tree | acf518b00bc830162b8f033f7b4921918818bd47 | |
| parent | 45fe28c951c3e70666ee4ef8379772851a8e4d32 (diff) | |
| parent | 9158a3564a970def3375a79e8f3f90927cd8e793 (diff) | |
| download | git-0ac270cf7c0d77b91670bda843578e943f5790bd.tar.xz | |
Merge branch 'tk/subtree-merge-not-ff-only'
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
| -rwxr-xr-x | contrib/subtree/git-subtree.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh index 71f1fd94bd..1af1d9653e 100755 --- a/contrib/subtree/git-subtree.sh +++ b/contrib/subtree/git-subtree.sh @@ -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 } |