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

[topgit.git] / .topmsg

diff --git a/.topmsg b/.topmsg
index e0237b65bbcb3109cb758c65c131bb483aad267d..381f6b564f2b1c39f4d239eea09beaaee09ab0e2 100644 (file)
--- a/.topmsg
+++ b/.topmsg
@@ -1,15 +1,6 @@
-From: martin f. krafft <madduck@debian.org>
-Subject: [TopGit PATCH] Ensure we are inside a Git worktree
+From: Ian Jackson <ijackson@chiark.greenend.org.uk>
+Subject: [PATCH] EMPTY - BASIS MERGE
 
-Bert Wesarg suggests to check that we are not inside the .git directory before
-setting up topgit. Because git rev-parse --git-dir only works in the top .git
-dir, not deeper (i.e. inside .git/refs) and will always return "."
+Empty patch for merge of included topic branches, only.
 
-This patch thus causes topgit to die early on when it's called from outside of
-a Git repository, or from underneath .git and outputs error messages
-accordingly.
-
-This temporarily makes it even more impossible to call tg --help, but I expect
-to have that fixed soon too.
-
-Signed-off-by: martin f. krafft <madduck@debian.org>
+Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>