Merge pull request #27 from ukleinek/fixup-amend

Properly squash commits created by git commit --fixup=amend:$rev
pengutronix · Nov 1, 2023 · acf990f · acf990f
2 parents e3dff52 + 419b0da
commit acf990f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/umpf b/umpf
@@ -992,7 +992,7 @@ rebase_branch() {
 		echo "# umpf-hashinfo: ${topicrev}" >&${series_out}
 
 		${GIT} rev-parse HEAD > "${STATE}/prev_head"
-		if ${GIT} log --oneline "${base}..${topicrev}" | grep -q '\(fixup\|squash\)!'; then
+		if ${GIT} log --oneline "${base}..${topicrev}" | grep -q '\(amend\|fixup\|squash\)!'; then
 			args="-i --autosquash"
 		fi
 		if ! ${GIT} rebase -q ${args} --onto HEAD "${base}" "${topicrev}" >&2; then