mirrors/jgit - jgit - source @ dussan.org

Historie

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