utils-code/tj.git-extras
1
0
Fork 0
mirror of https://github.com/tj/git-extras.git synced 2026-09-10 07:26:17 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

git-cp: don't stop execution when merge.ff is not set (#1096)

Browse source 
Signed-off-by: spacewander <spacewanderlzx@gmail.com>
This commit is contained in:
罗泽轩 2023-10-26 12:28:19 +08:00 committed by GitHub
parent 90221f2149
commit 78c5ca28a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/git-cp
View file

@ -51,7 +51,7 @@ else
fi
MERGE_OPT=
ff=$(git config --get merge.ff)
ff=$(git config --get merge.ff || true)
if [[ "$ff" == "only" ]]; then
MERGE_OPT="--ff"
fi