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年前
..
Attribute.java	Add the new class Attributes holding multiple Attribute(s)	8年前
Attributes.java	Support -merge attribute in binary macro	7年前
AttributesHandler.java	Organize imports	7年前
AttributesNode.java	Enable and fix warnings about redundant specification of type arguments	7年前
AttributesNodeProvider.java	Adds the git attributes computation on the treewalk	8年前
AttributesProvider.java	Add the new class Attributes holding multiple Attribute(s)	8年前
AttributesRule.java	Enable and fix warnings about redundant specification of type arguments	7年前
FilterCommand.java	Add support for built-in clean filters	7年前
FilterCommandFactory.java	Add support for built-in clean filters	7年前
FilterCommandRegistry.java	Add configuration parameter to enable built-in hooks/filters	7年前
package-info.java	Add basic support for .gitattributes	9年前