Package org.eclipse.jgit.merge
Class MergeMessageFormatter
java.lang.Object
org.eclipse.jgit.merge.MergeMessageFormatter
Formatter for constructing the commit message for a merge commit.
The format should be the same as C Git does it, for compatibility.
-
Constructor Summary
Constructors -
Method Summary
Modifier and TypeMethodDescriptionprivate static void
addConflictsMessage
(List<String> conflictingPaths, StringBuilder sb) Construct the merge commit message.formatWithConflicts
(String message, List<String> conflictingPaths) Add section with conflicting paths to merge message.private static String
-
Constructor Details
-
MergeMessageFormatter
public MergeMessageFormatter()
-
-
Method Details
-
format
Construct the merge commit message.- Parameters:
refsToMerge
- the refs which will be mergedtarget
- the branch ref which will be merged into- Returns:
- merge commit message
-
formatWithConflicts
Add section with conflicting paths to merge message.- Parameters:
message
- the original merge messageconflictingPaths
- the paths with conflicts- Returns:
- merge message with conflicting paths added
-
addConflictsMessage
-
joinNames
-