From 9997623cd3eb4dbcc565f0fd50887fcdc1039df0 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 17 Jan 2018 14:22:39 -0500 Subject: [PATCH] Make do-rebase rebase from grub-2.02 Signed-off-by: Peter Jones --- do-rebase | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/do-rebase b/do-rebase index ae03bd4..e911f5b 100755 --- a/do-rebase +++ b/do-rebase @@ -119,7 +119,7 @@ unset LC_ALL git rm -q 0*.patch > grub.patches -patches=$(othergit format-patch refs/remotes/rhboot/master..refs/remotes/rhboot/${releasever}) +patches=$(othergit format-patch grub-2.02..refs/remotes/rhboot/${releasever}) for x in $patches ; do echo Patch$(echo ${x} | cut -d- -f1): ${x} >> grub.patches done @@ -130,5 +130,5 @@ git add 0*.patch grub2.spec grub.patches if [ -z "$amend" ]; then fedpkg commit -s -c $amend else - git commit -m "" --amend + git commit --amend fi