aboutsummaryrefslogtreecommitdiff
path: root/sshfs.1.in
AgeCommit message (Collapse)Author
2017-06-06Added support for building with Meson.Nikolaus Rath
2016-12-30sshfs.1.in: remove duplicate "slave" option descriptionBerserker
2016-02-08Avoid using cpp for sshfs.1 generationJulio Merino
Move the logic to determine which values to stick into the manual page to the configure script and replace the logic to build the sshfs.1 manual page with sed instead of abusing cpp. I'm not using AC_OUTPUT here because this macro is typically used to generate support build files. Final artifacts of the build should, in general, be built by the Makefile itself.
2016-02-08Merge remote-tracking branch 'osxfuse/master' into merge-osxfuseJulio Merino
Pull in all changes from osxfuse's fork of sshfs into libfuse's sshfs. There need not be two different copies of this codebase, particularly because libfuse's version is already autoconf-ified and can support multiple platforms. The merge is mostly clean with just a few manual edits to resolve conflicts.
2014-02-02Merge tag 'sshfs_2_5'Benjamin Fleischer
Conflicts: sshfs.c
2013-08-03Merge remote-tracking branch 'upstream/master'Benjamin Fleischer
Conflicts: ChangeLog configure.ac sshfs.1.in sshfs.c
2012-03-11Add Darwin/OS X specific information to man pageBenjamin Fleischer
* Volumes are unmounted using "umount" not "fusermount" * idmap=user is the deafault setting on Darwin/OS X