Skip to content

Commit ce338a9

Browse files
committed
scripts/sync-branch: Fix non-interactive merge
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
1 parent 9ba113b commit ce338a9

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

scripts/sync-branch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fi
1010
tags_to_sync=("$@")
1111

1212
for tag_to_sync in "${tags_to_sync[@]}"; do
13-
if git merge --no-ff "$tag_to_sync"; then
13+
if git merge --no-edit --no-ff "$tag_to_sync"; then
1414
continue
1515
fi
1616

0 commit comments

Comments
 (0)