Append merge strategy to reflog message

Change-Id: Ia0e73208b86c45a3d96698e973f6e70ec5cb7303
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java
index a9f78c076b0084cedad249be7e52431aebbe7f3a..c7a30ebe17698b643174c1b197596dd4a9b7a245 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java
@@ -210,7 +210,9 @@ public class MergeCommand extends GitCommand<MergeResult> {
                                        unmergedPaths = resolveMerger.getUnmergedPaths();
                                } else
                                        noProblems = merger.merge(headCommit, srcCommit);
-
+                               refLogMessage.append(": Merge made by ");
+                               refLogMessage.append(mergeStrategy.getName());
+                               refLogMessage.append('.');
                                if (noProblems) {
                                        DirCacheCheckout dco = new DirCacheCheckout(repo,
                                                        headCommit.getTree(), repo.lockDirCache(),