Improve the "publish" merge message to give slightly more information
authorCatalin Marinas <catalin.marinas@arm.com>
Thu, 11 Jun 2009 11:07:54 +0000 (12:07 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Thu, 11 Jun 2009 11:07:54 +0000 (12:07 +0100)
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
stgit/commands/publish.py

index 401fbdf..0358a09 100644 (file)
@@ -106,7 +106,8 @@ def func(parser, options, args):
     # base by setting two parents.
     merge_bases = repository.get_merge_bases(public_head, stack.base)
     if not stack.base in merge_bases:
-        message = 'Merge ' + repository.describe(stack.base)
+        message = 'Merge %s into %s' % (repository.describe(stack.base),
+                                        public_ref)
         public_head = __create_commit(repository, stack.head.data.tree,
                                       [public_head, stack.base], options,
                                       message)