Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase status: Fix commit reporting. Closes:903131.
* git-debrebase new-upstream: Add a -1 revision if the user
didn't supply one. Closes:#903127.
+ * git-debrebase: Improve grammar if one blocking snag.
* dgit(1): Unscramble push[-source] descriptions. Closes:#903116.
--
$us, $snags_tripped;
} else {
fail sprintf
- "%s: snags: %d blockers (you could -f<tag>, or --force)",
+ "%s: snags: %d blocker(s) (you could -f<tag>, or --force)",
$us, $snags_tripped;
}
}