mirrors/jgit - jgit - source @ dussan.org

文件历史

Mathieu Cartaud f7e233e450 Support -merge attribute in binary macro The merger is now able to react to the use of the merge attribute. The value unset and the custom value 'binary' are handled (-merge and merge=binary) Since the specification of the merge attribute states that when the attribute is unset, ours version must be kept in case of a conflict, we don't overwrite the file but keep the local version. Bug: 517128 Change-Id: Ib5fbf17bdaf727bc5d0e106ce88f2620d9f87a6f Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>		7 年前
..
api	Fix bug in multiple tag handling on DescribeCommand	7 年前
attributes	Support -merge attribute in binary macro	7 年前
diff	Make diff locations more consistent	7 年前
dircache	Enable and fix warnings about redundant specification of type arguments	7 年前
events	Enable and fix 'Should be tagged with @Override' warning	7 年前
fnmatch	FileNameMatcherTest: Use Character.valueOf rather than new Character	7 年前
gitrepo	Fix out-of-bounds exception in RepoCommand#relative	7 年前
ignore	Ignore trailing spaces in directory rule patterns	7 年前
indexdiff	Fix symlink content comparison on MacOS in tree walk	7 年前
internal/storage	Add a new singlePack option to PackConfig	7 年前
junit	Clarify the semantics of DfsRefDatabase#compareAndPut	7 年前
lib	Add tests for SubmoduleConfig	7 年前
merge	Support creating Mergers without a Repository	7 年前
nls	Enable and fix 'Should be tagged with @Override' warning	7 年前
notes	Enable and fix warnings about redundant specification of type arguments	7 年前
patch	Organize imports	7 年前
revplot	Enable and fix warnings about redundant specification of type arguments	7 年前
revwalk	RevFlagSetTest: Fix compilation error flagged by error prone	7 年前
storage/file	Remove hardcoded target/trash from test cases	10 年前
submodule	Enable and fix warnings about redundant specification of type arguments	7 年前
symlinks	SymlinksTest: Open git and TreeWalk in try-with-resource	8 年前
test/resources	Fix loop in auto gc	7 年前
transport	BundleWriter: Allow constructing from only an ObjectReader	7 年前
treewalk	Correct the boolean logic for filtering paths	7 年前
util	Fix null return from FS.readPipe when command fails to launch	7 年前