chiark
/
gitweb
/
~ian
/
topgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'refs/top-bases/i/basis-merge' into i/basis-merge
[topgit.git]
/
.topmsg
diff --git
a/.topmsg
b/.topmsg
index 6347b54b6ffb4f2dbc97d6bfaef1f606c10fb92a..381f6b564f2b1c39f4d239eea09beaaee09ab0e2 100644
(file)
--- a/
.topmsg
+++ b/
.topmsg
@@
-1,8
+1,6
@@
-From:
martin f. krafft <madduck@debian.org
>
-Subject: [
TopGit PATCH] Add Vim modelines for consistent spacing
+From:
Ian Jackson <ijackson@chiark.greenend.org.uk
>
+Subject: [
PATCH] EMPTY - BASIS MERGE
-TopGit shell scripts use tabs and this commit instructs Vim via modeline not
-to expand tabs.
+Empty patch for merge of included topic branches, only.
-Signed-off-by: martin f. krafft <madduck@debian.org>
-Acked-by: Petr Baudis <pasky@ucw.cz>
+Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>