X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=.topmsg;h=381f6b564f2b1c39f4d239eea09beaaee09ab0e2;hb=c4966db6cae694317ab5af8a05924809c95eaab9;hp=e7351b9d7a45f40d054b9673b902a7ef850f69af;hpb=a6f17aabcf0318fd2ab2e55c9ff13b13a54b25dc;p=topgit.git

diff --git a/.topmsg b/.topmsg
index e7351b9..381f6b5 100644
--- a/.topmsg
+++ b/.topmsg
@@ -1,8 +1,6 @@
-From: martin f. krafft <madduck@debian.org>
-Subject: [TopGit PATCH] ensure we are in the worktree, not .git
+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.
 
-Signed-off-by: martin f. krafft <madduck@debian.org>
+Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>