diff --git a/tools/apertis-pkg-merge-local b/tools/apertis-pkg-merge-local index 5e84ae4c5f5de92127c2b199adec46d8d1a6ab34..e615b71deebade1205a394e61402d8aeae98019c 100755 --- a/tools/apertis-pkg-merge-local +++ b/tools/apertis-pkg-merge-local @@ -67,7 +67,7 @@ diff_old() { git diff $EXTRA_ARGS origin/$UPSTREAM_BRANCH_OLD origin/$DOWNSTREAM_BRANCH_OLD ':(exclude)debian/apertis' ':(exclude)debian/changelog' } -commit() { +release() { dch --force-distribution --distribution apertis --local +apertis --upstream Rebase on top of $UPSTREAM_BRANCH git add debian/changelog git diff --cached @@ -92,11 +92,11 @@ diff) diff_old) diff_old ;; -commit) - commit +release) + release ;; *) echo Unknown command - echo Usage `basename $0` '[merge|diff|diff_old|commit]' + echo Usage `basename $0` '[merge|diff|diff_old|release]' ;; esac