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

[topgit.git] / .topmsg

diff --git a/.topmsg b/.topmsg
index d8a6765cfedaecef8c48fd35ffba3c428f39c909..381f6b564f2b1c39f4d239eea09beaaee09ab0e2 100644 (file)
--- a/.topmsg
+++ b/.topmsg
@@ -1,7 +1,6 @@
-From: martin f. krafft <madduck@debian.org>
-Subject: [PATCH] Print help message when command is not proper
+From: Ian Jackson <ijackson@chiark.greenend.org.uk>
+Subject: [PATCH] EMPTY - BASIS MERGE
 
-When invoked with an unknown subcommand, or when --help is sought for
-a command that does not exist, TopGit prints the help message.
+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>