forgejo

Commit Graph

Author	SHA1	Message	Date
Christian Muehlhaeuser	54d96c79b5	Removed unnecessary conversions (#7557 ) No need to convert to the same type.	5 years ago
zeripath	baefea311f	Fix #732 : Add LFS objects to base repository on merging (#7082 ) On merge we walk the merge history and ensure that all lfs objects pointed to in the history are added to the base repository. This switches from relying on having git-lfs installed on the server, (and in fact .gitattributes being correctly installed.)	5 years ago

Author

SHA1

Message

Date

Christian Muehlhaeuser

54d96c79b5

Removed unnecessary conversions (#7557 )

No need to convert to the same type.

zeripath

baefea311f

Fix #732 : Add LFS objects to base repository on merging (#7082 )

On merge we walk the merge history and ensure that all lfs objects pointed to in
the history are added to the base repository. This switches from relying on having git-lfs installed on the server, (and in fact .gitattributes being correctly installed.)

2 Commits (c534b7e211d3264bbbde9b95cd8d6e9e60ad4215)