From: Catalin Marinas Date: Thu, 11 Jun 2009 11:07:54 +0000 (+0100) Subject: Improve the "publish" merge message to give slightly more information X-Git-Tag: v0.15-rc1~6 X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/111251132edff92d1681d915af0d060af35250d2 Improve the "publish" merge message to give slightly more information Signed-off-by: Catalin Marinas --- diff --git a/stgit/commands/publish.py b/stgit/commands/publish.py index 401fbdf..0358a09 100644 --- a/stgit/commands/publish.py +++ b/stgit/commands/publish.py @@ -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)