mirrors/jgit - jgit - source @ dussan.org

歷史記錄

Konrad Kügler 48544e27ae Preserve merges during pull if configured to do so Setting branch.<name>.rebase or pull.rebase to 'preserve' will preserve merges during rebase. Also, pull.rebase is now consulted if there is no branch-specific configuration. Bug: 429664 Change-Id: I345fa295c7e774e0d0a8e6aba30fbfc3552e0084 Signed-off-by: Konrad Kügler <swamblumat-eclipsebugs@yahoo.de>		10 年之前
..
api	Preserve merges during pull if configured to do so	9 年之前
blame	blame: Un-break isFile check in tree walk	10 年之前
diff	Handle diff formatting when there is nothing to compare with	10 年之前
dircache	Fix a number of failing conflict situations	10 年之前
errors	Throw CorruptObjectException when a bad object is found	10 年之前
events	Mark non-externalizable strings as such	11 年之前
fnmatch	Cleanup javadocs so they pass the java8 doclint checks	10 年之前
gitrepo	Remove an unnecessary $NON-NLS$ comment	10 年之前
ignore	Fix IgnoreRule#isMatch returning wrong result due to missing reset	10 年之前
internal	Merge branch 'stable-3.4'	10 年之前
lib	Preserve merges during pull if configured to do so	9 年之前
merge	Merge "Make the resolve merger slightly more sub-classable."	10 年之前
nls	Enable NLS / TranslationBundle to be used in OSGi	10 年之前
notes	[findBugs] Ensure streams are closed in a finally block	10 年之前
patch	Mark non-externalizable strings as such	11 年之前
revplot	Improve layout of branches in the commit graph	10 年之前
revwalk	Don't set REWRITE flag unless parent rewriting is requested	10 年之前
storage	Cleanup javadocs so they pass the java8 doclint checks	10 年之前
submodule	Mark non-externalizable strings as such	11 年之前
transport	Merge branch 'stable-3.4'	10 年之前
treewalk	Fix a number of failing conflict situations	10 年之前
util	Add missing since tags	10 年之前