mirrors/jgit - jgit - source @ dussan.org

履歴

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年前
..
MergeAlgorithm.java	Change default diff algorithm to histogram and add tests	13年前
MergeChunk.java	Fix Javadoc warnings	14年前
MergeFormatter.java	Refactor diff sequence API	13年前
MergeMessageFormatter.java	Don't print "into HEAD" when merging refs/heads/master	13年前
MergeResult.java	Refactor diff sequence API	13年前
MergeStrategy.java	Extend merge support for bare repositories	13年前
Merger.java	Add getBaseCommit() to Merger	13年前
ResolveMerger.java	Fix misc spelling errors in comments and method names	13年前
StrategyOneSided.java	Extend merge support for bare repositories	13年前
StrategyResolve.java	Extend merge support for bare repositories	13年前
StrategySimpleTwoWayInCore.java	Simplify logic in StrategySimpleTwoWayInCore	13年前
ThreeWayMergeStrategy.java	Extend merge support for bare repositories	13年前
ThreeWayMerger.java	Extend merge support for bare repositories	13年前