1040 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
trapexit	c7e93720ff	Merge pull request #496 from trapexit/doc-updates ... tweak docs, add FAQ regarding vendoring of libfuse	2018-08-20 13:40:41 -04:00
Antonio SJ Musumeci	587ab62583	tweak docs, add FAQ regarding vendoring of libfuse	2018-08-20 13:40:01 -04:00
trapexit	a894360402	Merge pull request #495 from ahippo/external-fuse ... Option for building with system libfuse	2018-08-20 12:05:37 -04:00
Andrey Mazo	756d4ff0ff	Makefile: option for building with system libfuse ... Add INTERNAL_FUSE variable to control linking against bundled libfuse vs external/system libfuse. If external libfuse is requested, `pkg-config` is used to obtain CFLAGS/LIBS/LDFLAGS and to check that the provided external libfuse is >= 2.9.7. This might hopefully get mergerfs closer to inclusion into distros. Link: https://github.com/trapexit/mergerfs/issues/431 Link: https://bugs.gentoo.org/587956#c6	2018-08-20 00:05:58 +03:00
Andrey Mazo	ec6adaa376	options: move "-o threads=" help text to libfuse/ ... Parsing of and acting upon "-o threads" option is done in the bundled `libfuse/`, so move the corresponding help text there too. This make help text consistent with behavior when building against system libfuse, which doesn't support this option.	2018-08-19 21:04:35 +03:00
trapexit	dee2c3e23b	Merge pull request #494 from trapexit/hardlinks ... add FAQ entry on hard links	2018-08-18 22:10:54 -04:00
Antonio SJ Musumeci	fc52f89ddc	add FAQ entry on hard links	2018-08-18 22:10:23 -04:00
trapexit	fdbafa63ba	Merge pull request #493 from ahippo/ldflags ... Makefile: don't touch LDFLAGS	2018-08-13 07:18:58 -04:00
Andrey Mazo	e987ff46c2	Makefile: don't touch LDFLAGS ... These are more like LIBS rather than LDFLAGS. They are used just in one place, so simply put them inline. Also, use LDFLAGS provided by the user during actual link. This helps users pass their own LDFLAGS. For example, this is important on Gentoo, where LDFLAGS='-Wl,-O1 -Wl,--as-needed' is passed by default.	2018-08-13 06:02:29 +03:00
trapexit	b1ecc58114	Merge pull request #491 from trapexit/inode_docs ... add details regarding use_ino	2018-07-25 17:29:06 -04:00
Antonio SJ Musumeci	39d5ab8e83	add details regarding use_ino	2018-07-25 17:28:36 -04:00
trapexit	4b1f9afe1e	Merge pull request #482 from trapexit/docs ... change examples to use /mnt rather than /tmp	2018-05-04 08:59:27 -04:00
Antonio SJ Musumeci	c005463111	change examples to use /mnt rather than /tmp	2018-05-04 09:00:27 -04:00
trapexit	50384f4e86	Merge pull request #475 from trapexit/version ... fix version.hpp creation, again	2018-03-24 06:53:35 -07:00
Antonio SJ Musumeci	73e8867400	fix version.hpp creation, again	2018-03-24 09:51:25 -04:00
trapexit	0545da67ff	Merge pull request #474 from trapexit/version ... fix versioning with tarball building	2018-03-16 23:27:04 -04:00
Antonio SJ Musumeci	24e690b995	fix versioning with tarball building	2018-03-16 23:26:29 -04:00
trapexit	89200a0ab8	Merge pull request #473 from trapexit/version ... version bumps and calculation fixes	2018-03-09 21:14:44 -05:00
Antonio SJ Musumeci	e521833cec	bump change date on readme and rebuild man	2018-03-09 21:12:52 -05:00
Antonio SJ Musumeci	737d941941	bump builtin libfuse version	2018-03-09 21:10:09 -05:00
Antonio SJ Musumeci	9830e29945	fix version generation	2018-03-09 21:06:00 -05:00
trapexit	6418b00ac3	Merge pull request #472 from trapexit/clonepathperms ... ignore clonepath metadata errors. fixes #470	2018-03-08 16:56:33 -05:00
Antonio SJ Musumeci	cfe9c28a10	ignore clonepath metadata errors. fixes #470	2018-03-08 16:55:35 -05:00
trapexit	aa6e4c1865	Merge pull request #471 from trapexit/clonepath ... stop clonepath at base directory. fixes #467	2018-03-08 16:48:53 -05:00
Antonio SJ Musumeci	f48c16d162	stop clonepath at base directory. fixes #467	2018-03-07 18:46:32 -05:00
trapexit	62ae871d51	Merge pull request #469 from trapexit/hard_remove ... add hard_remove details and comment on unionfs	2018-03-03 13:25:15 -05:00
trapexit	906702de77	add hard_remove details and comment on unionfs	2018-03-03 13:24:49 -05:00
trapexit	db27a91a58	Merge pull request #461 from agsimmons/master ... Remove duplicate word in README	2018-01-18 15:41:57 -05:00
Andrew Simmons	b4a003c5a8	Remove duplicate word in README	2018-01-18 15:38:16 -05:00
trapexit	b48054fa2c	add XRP to support list	2017-12-21 09:47:53 -05:00
trapexit	d8f05ac8ae	add BCH, ETH, & LTC donation addresses	2017-12-20 22:11:26 -05:00
trapexit	8843ace757	Merge pull request #454 from trapexit/faq ... add explination in FAQ about what mergerfs is / is not	2017-11-15 16:40:24 -05:00
Antonio SJ Musumeci	7d93d5917e	add explination in FAQ about what mergerfs is / is not	2017-11-15 16:39:25 -05:00
trapexit	8846a135bc	Merge pull request #452 from trapexit/faq ... faq answer on epmfs	2017-11-07 14:49:38 -05:00
Antonio SJ Musumeci	7207e7fdd6	faq answer on epmfs	2017-11-07 14:48:38 -05:00
trapexit	a8e6128034	Merge pull request #451 from trapexit/faq ... update FAQ and misc tweaks	2017-11-07 09:00:29 -05:00
Antonio SJ Musumeci	f72bb1e1ed	update FAQ and misc tweaks	2017-11-07 08:59:49 -05:00
trapexit	cf5d28ea4a	Merge pull request #450 from trapexit/support ... add support info and how mergerfs works section	2017-11-05 13:44:40 -05:00
Antonio SJ Musumeci	bd14f33c31	add support info and how mergerfs works section	2017-11-05 13:43:33 -05:00
trapexit	73561c1861	Merge pull request #449 from trapexit/issue-template ... Create issue_template.md	2017-11-05 12:10:15 -05:00
trapexit	43d50ca471	Create issue_template.md	2017-11-05 12:09:53 -05:00
trapexit	8ea0b395b2	Merge pull request #445 from trapexit/setreuid ... call 32bit versions of set/geteuid on 32bit platforms	2017-10-17 22:23:27 -04:00
Antonio SJ Musumeci	1d6d22727c	call 32bit versions of set/geteuid on 32bit platforms	2017-10-17 22:21:29 -04:00
Antonio SJ Musumeci	b3c10f5bdf	Merge pull request #435 from trapexit/man ... rebuild manpage	2017-08-06 14:43:03 -04:00
Antonio SJ Musumeci	821d1b6964	rebuild manpage	2017-08-06 14:42:35 -04:00
Antonio SJ Musumeci	6067478e00	Merge pull request #434 from trapexit/makefile ... fixup makefile	2017-08-06 14:41:11 -04:00
Antonio SJ Musumeci	ebe737e995	fixup makefile	2017-08-06 14:39:56 -04:00
Antonio SJ Musumeci	e2a9509896	Merge pull request #433 from trapexit/doc-update ... misc updates to docs	2017-08-06 14:34:14 -04:00
Antonio SJ Musumeci	9104f25c09	misc updates to docs	2017-08-06 14:33:59 -04:00
Antonio SJ Musumeci	713c911264	Merge pull request #429 from trapexit/support ... expand support section of readme	2017-07-30 16:53:26 -04:00