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