Age | Commit message (Collapse) | Author | |
---|---|---|---|
2016-02-08 | Merge remote-tracking branch 'osxfuse/master' into merge-osxfuse | Julio 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-02 | Merge tag 'sshfs_2_5' | Benjamin Fleischer | |
Conflicts: sshfs.c | |||
2013-08-03 | Merge remote-tracking branch 'upstream/master' | Benjamin Fleischer | |
Conflicts: ChangeLog configure.ac sshfs.1.in sshfs.c | |||
2012-03-11 | Add Darwin/OS X specific information to man page | Benjamin Fleischer | |
* Volumes are unmounted using "umount" not "fusermount" * idmap=user is the deafault setting on Darwin/OS X |