mirrors/jgit - jgit - source @ dussan.org

Cronologia

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 anni fa
..
api	Preserve merges during pull if configured to do so	10 anni fa
diff	Handle diff formatting when there is nothing to compare with	10 anni fa
dircache	Move base test classes to the junit bundle for reuse for Java 7 tests	11 anni fa
events	Move base test classes to the junit bundle for reuse for Java 7 tests	11 anni fa
fnmatch	Added characters to be escaped in file name patterns	11 anni fa
gitrepo	Unit test for the updating behavior in RepoCommand API.	10 anni fa
ignore	Fix IgnoreRule#isMatch returning wrong result due to missing reset	10 anni fa
internal/storage	Remove a bit of repetition and casting in PackFileTest	10 anni fa
lib	Fix a number of failing conflict situations	10 anni fa
merge	Fix merge/cherry-picking in CRLF mode	10 anni fa
nls	Move org.eclipse.jgit.pgm's resource bundle to internal package	11 anni fa
notes	Move base test classes to the junit bundle for reuse for Java 7 tests	11 anni fa
patch	Suppress boxing warnings where we know they are ok	11 anni fa
revplot	Improve layout of branches in the commit graph	10 anni fa
revwalk	Rename RewriteTreeFilter to TreeRevFilter and make it public	10 anni fa
storage/file	Remove hardcoded target/trash from test cases	10 anni fa
submodule	Use absolute paths for file:// URIs in tests	10 anni fa
test/resources	Move SampleDataRepositoryTestCase to org.eclipse.jgit.test	10 anni fa
transport	Allow retrying connecting SshSession in case of an exception	10 anni fa
treewalk	Fix FileTreeIteratorTest#testIsModifiedFileSmudged() on Windows	10 anni fa
util	Cache SimpleDateFormat in GitDateParser per locale	10 anni fa