Markus Duft d3ed64bcd4 LFS: support merge/rebase/cherry-pick/diff/compare with LFS files ... Respect merge=lfs and diff=lfs attributes where required to replace (in memory) the content of LFS pointers with the actual blob content from the LFS storage (and vice versa when staging/merging). Does not implement general support for merge/diff attributes for any other use case apart from LFS. Change-Id: Ibad8875de1e0bee8fe3a1dffb1add93111534cae Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>		2018-03-03 11:39:43 +01:00
..
api	LFS: support merge/rebase/cherry-pick/diff/compare with LFS files	2018-03-03 11:39:43 +01:00
attributes	MergeGitAttributeTest: Open FileInputStream in try-with-resource	2018-02-26 17:48:42 +09:00
diff	Use constants from StandardCharsets instead of hard-coded strings	2017-12-07 20:02:59 +09:00
dircache	Enable and fix warnings about redundant specification of type arguments	2017-02-20 22:47:23 +01:00
events	Enable and fix 'Should be tagged with @Override' warning	2017-02-19 20:05:08 -04:00
fnmatch	FileNameMatcherTest: Use Character.valueOf rather than new Character	2016-10-19 15:09:37 +09:00
gitrepo	RepoCommand: generate relative submodule URLs from absolute URLs.	2018-02-21 13:41:50 +01:00
ignore	IgnoreNodeTest: Suppress deprecation warnings in testEmptyIgnoreNode	2018-02-25 17:36:38 +09:00
indexdiff	Use constants from StandardCharsets instead of hard-coded strings	2017-12-07 20:02:59 +09:00
internal/storage	MergedReftable to skip shadowed refs in same reftable	2018-02-09 09:49:24 -08:00
junit	Clarify the semantics of DfsRefDatabase#compareAndPut	2016-08-25 19:12:39 -07:00
lib	Add ObjectIdSerializer	2018-02-25 23:15:01 +01:00
merge	RecursiveMergerTest: Open FileOutputStream in try-with-resource	2018-02-26 17:39:57 +09:00
nls	Enable and fix 'Should be tagged with @Override' warning	2017-02-19 20:05:08 -04:00
notes	Enable and fix warnings about redundant specification of type arguments	2017-02-20 22:47:23 +01:00
patch	Organize imports	2016-11-14 13:25:20 -08:00
revplot	Enable and fix warnings about redundant specification of type arguments	2017-02-20 22:47:23 +01:00
revwalk	Fix remaining javadoc errors raised by doclint	2017-12-21 02:42:14 +01:00
storage/file	Use constants from StandardCharsets instead of hard-coded strings	2017-12-07 20:02:59 +09:00
submodule	Add a command to deinitialize submodules	2017-12-27 23:47:25 +01:00
symlinks	Fix remaining javadoc errors raised by doclint	2017-12-21 02:42:14 +01:00
test/resources	ObjectDirectory: Add pack directory getter	2017-11-14 10:08:42 -05:00
transport	Merge branch 'stable-4.10'	2018-02-14 23:28:28 +01:00
treewalk	Fix remaining javadoc errors raised by doclint	2017-12-21 02:42:14 +01:00
util	Use constants from StandardCharsets instead of hard-coded strings	2017-12-07 20:02:59 +09:00