Merged in bugfix/pipeline-changelog-generation (pull request #24)

bugfix: pipeline changelog generation

Approved-by: Jonathan Teran

src/git_flow/main.py

@@ -404,7 +404,8 @@ def tag_command():
             [service, repository] = parse_url(url)
             create_tag(service, repository, token, new_version, commit)
 
-        if update_changelog(merged_branch, branch):
+        merged_commit = Git("show", "HEAD^2", patch=False, format="%H").firstline()
+        if update_changelog(merged_commit, branch):
             Git("add", Git.CHANGELOG_FILE).exec()
             Git("commit", message=Git.BUMP_VERSION).exec()
             Git("push").exec()