mirrors/jgit - jgit - source @ dussan.org

Historik

Robin Stocker b0245b548b Don't print "into HEAD" when merging refs/heads/master When MergeMessageFormatter was given a symbolic ref HEAD which points to refs/heads/master (which is the case when merging a branch in EGit), it would result in a merge message like the following: Merge branch 'a' into HEAD But it should print the following (as C Git does): Merge branch 'a' The solution is to use the leaf ref when checking for refs/heads/master. Change-Id: I28ae5713b7e8123a0176fc6d7356e469900e7e97		13 år sedan
..
MergeAlgorithm.java	Change default diff algorithm to histogram and add tests	13 år sedan
MergeChunk.java	Fix Javadoc warnings	14 år sedan
MergeFormatter.java	Refactor diff sequence API	13 år sedan
MergeMessageFormatter.java	Don't print "into HEAD" when merging refs/heads/master	13 år sedan
MergeResult.java	Refactor diff sequence API	13 år sedan
MergeStrategy.java	Extend merge support for bare repositories	13 år sedan
Merger.java	Add getBaseCommit() to Merger	13 år sedan
ResolveMerger.java	Fix misc spelling errors in comments and method names	13 år sedan
StrategyOneSided.java	Extend merge support for bare repositories	13 år sedan
StrategyResolve.java	Extend merge support for bare repositories	13 år sedan
StrategySimpleTwoWayInCore.java	Simplify logic in StrategySimpleTwoWayInCore	13 år sedan
ThreeWayMergeStrategy.java	Extend merge support for bare repositories	13 år sedan
ThreeWayMerger.java	Extend merge support for bare repositories	13 år sedan