Commit 76829ca0 authored by Christos Stavrakakis's avatar Christos Stavrakakis

Fix git version compatibility issue

parent 5da1e243
......@@ -97,7 +97,8 @@ dialog --yesno "Create Snapshot?" 5 20 && snap=true && dchextra=-S && mrgextra=
# merge local branch into tmp branch with a nice commit message,
# so it can be pushed as is to upstream debian
git merge --no-edit $mrgextra ${mrgextra:+"$mrgmsg"} $LOCALBRANCH
GIT_MERGE_AUTOEDIT=no
git merge $mrgextra ${mrgextra:+"$mrgmsg"} $LOCALBRANCH
# auto edit Debian changelog depending on Snapshot or Release mode
export EDITOR=/usr/bin/vim
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment