motiejus
/
jgit
1
Fork 0
Code Releases Activity

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>
This commit is contained in:
Robin Rosenberg 2011-09-08 18:35:17 +02:00 committed by Matthias Sohn
parent 4f4e468f6f
commit 39ad503fcb
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java
View File

@ -210,7 +210,9 @@ public MergeResult call() throws NoHeadException,
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(),