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:
parent
4f4e468f6f
commit
39ad503fcb
|
@ -210,7 +210,9 @@ public MergeResult call() throws NoHeadException,
|
||||||
unmergedPaths = resolveMerger.getUnmergedPaths();
|
unmergedPaths = resolveMerger.getUnmergedPaths();
|
||||||
} else
|
} else
|
||||||
noProblems = merger.merge(headCommit, srcCommit);
|
noProblems = merger.merge(headCommit, srcCommit);
|
||||||
|
refLogMessage.append(": Merge made by ");
|
||||||
|
refLogMessage.append(mergeStrategy.getName());
|
||||||
|
refLogMessage.append('.');
|
||||||
if (noProblems) {
|
if (noProblems) {
|
||||||
DirCacheCheckout dco = new DirCacheCheckout(repo,
|
DirCacheCheckout dco = new DirCacheCheckout(repo,
|
||||||
headCommit.getTree(), repo.lockDirCache(),
|
headCommit.getTree(), repo.lockDirCache(),
|
||||||
|
|
Loading…
Reference in New Issue