From 5451267a4e10864c393d14aef7f83697b9d078e1 Mon Sep 17 00:00:00 2001 From: Walter Lozano <walter.lozano@collabora.com> Date: Fri, 17 Jan 2025 15:47:09 -0300 Subject: [PATCH] apertis-pkg-merge-local: Rename commit to release The commit command is intended to update the changelog and commit the changes, to make the use of the command clearer rename it to release. Signed-off-by: Walter Lozano <walter.lozano@collabora.com> --- tools/apertis-pkg-merge-local | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/apertis-pkg-merge-local b/tools/apertis-pkg-merge-local index 5e84ae4..e615b71 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 -- GitLab