summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-06-04 12:41:23 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-16 16:47:47 +0100
commit561bf70f8de802ba788e3d2f3be787015e5b02c0 (patch)
tree54fe511ece00335bef2663428b6ea979e42f5ad2 /dgit
parente17b7eb17ed4aa309c1a1b3757db1e0fc123df68 (diff)
Split brain: Improve quiltify() message
Actually --quilt=gbp and --quilt=unapplied (well, what's called --quilt=apply here) aren't going to be quite identical.
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit2
1 files changed, 1 insertions, 1 deletions
diff --git a/dgit b/dgit
index 2c72213..295bbdf 100755
--- a/dgit
+++ b/dgit
@@ -2682,7 +2682,7 @@ sub quiltify ($$$$) {
if (quilt_could_gbp($target,$unapplied,$oldtiptree)) {
print STDERR <<END;
$us: Tree looks like a patches-unapplied git branch.
-$us: Maybe you forgot --quilt=gbp (aka --quilt=apply) ?
+$us: Maybe you forgot --quilt=gbp (or --quilt=apply) ?
END
}
fail "quilt fixup naive history linearisation failed.\n".