Display multi-line commit and tag messages (#3096)

src/blenderbim/blenderbim/bim/module/ifcgit/ui.py

@@ -139,8 +139,9 @@ class IFCGIT_PT_panel(bpy.types.Panel):
         row.label(text=item.hexsha)
         row = column.row()
         row.label(text=item.author_name + " <" + item.author_email + ">")
-        row = column.row()
-        row.label(text=item.message)
+        for message_line in item.message.split("\n"):
+            row = column.row()
+            row.label(text=message_line)
 
         for tag in item.tags:
             box = layout.box()
@@ -150,8 +151,9 @@ class IFCGIT_PT_panel(bpy.types.Panel):
             row.label(text=tag.name)
             row.operator("ifcgit.delete_tag", icon="PANEL_CLOSE").tag_name = tag.name
             if tag.message:
-                row = column.row()
-                row.label(text=tag.message)
+                for message_line in tag.message.split("\n"):
+                    row = column.row()
+                    row.label(text=message_line)
 
         box = layout.box()
         row = box.row()

src/blenderbim/blenderbim/tool/ifcgit.py

@@ -421,7 +421,7 @@ class IfcGit:
                         return False
 
             repo.index.add(path_ifc)
-            props.commit_message = "Merged branch: " + props.display_branch
+            props.commit_message = "Merge branch '" + props.display_branch + "' into " + repo.active_branch.name
             props.display_branch = repo.active_branch.name
 
             cls.load_project(path_ifc)

src/blenderbim/docs/users/git_support.rst

@@ -73,6 +73,12 @@ are the same as above: green objects are new to the current model, blue
 objects have changed in some way, and (if you have an older revision loaded)
 red objects have been deleted.
 
+Viewing object history
+----------------------
+
+The history of *everything* in the project is tracked in Git, the revision log
+for the currently selected object can be viewed with the BlenderBIM side-bar.
+
 Retrieving Revisions
 --------------------
 
@@ -156,6 +162,12 @@ optional message text.
     Similar to commit messages, tag messages should be 50 characters or less,
     though there is no practical limit.
 
+.. Warning::
+
+    Tags can be deleted locally, but Git is distributed, so if the tag has
+    migrated to a remote repository it will reappear when you fetch changes
+    from that repository.
+
 Remote operations
 -----------------