diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2011-09-08 18:35:17 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2011-09-21 23:36:46 +0200 |
| commit | 39ad503fcb0c293e9c6d47d653a0d52456d4760b (patch) | |
| tree | b4ac1c331304c3f121f55d074f10e574e23521fa | |
| parent | 4f4e468f6f344ed7c106b86b850d2c9171dd1a0f (diff) | |
| download | jgit-39ad503fcb0c293e9c6d47d653a0d52456d4760b.tar.gz jgit-39ad503fcb0c293e9c6d47d653a0d52456d4760b.zip | |
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>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 a9f78c076b..c7a30ebe17 100644 --- 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(), |