Browse Source

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>
tags/v1.2.0.201112221803-r
Robin Rosenberg 12 years ago
parent
commit
39ad503fcb
1 changed files with 3 additions and 1 deletions
  1. 3
    1
      org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java

+ 3
- 1
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java View File

@@ -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(),

Loading…
Cancel
Save