Merge commit 'refs/top-bases/i/basis-merge' into i/basis-merge

[topgit.git] / .topmsg

diff --git a/.topmsg b/.topmsg
index 65a11de3dcc119251d316c1ab691c2f6810937c3..381f6b564f2b1c39f4d239eea09beaaee09ab0e2 100644 (file)
--- a/.topmsg
+++ b/.topmsg
@@ -1,7 +1,6 @@
-From: martin f. krafft <madduck@debian.org>
-Subject: [TopGit PATCH] Require an argument to tg -r
+From: Ian Jackson <ijackson@chiark.greenend.org.uk>
+Subject: [PATCH] EMPTY - BASIS MERGE
 
-Right now, if -r is passed to tg, an ugly shift error occurs. This patch
-checks for that case and outputs the help message if it occurs.
+Empty patch for merge of included topic branches, only.
 
-Signed-off-by: martin f. krafft <madduck@debian.org>
+Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>