git/fs: move mount point to $repo/.git/fs

Moving the mount point to within the repo
directory means that we can have multiple
git repos mounted at once with no conflict.

2 files changed, 12 insertions, 5 deletions

diff --git a/sys/man/1/git b/sys/man/1/git
index 7b04c037b..ad903a44d 100644
--- a/sys/man/1/git
+++ b/sys/man/1/git
@@ -18,7 +18,7 @@ git/pull, git/rm, git/serve
 .PP
 .B git/branch
 [
-.B -adns
+.B -admns
 ]
 [
 .B -b
@@ -211,7 +211,7 @@ This suite of
 tools provides a file interface to the
 .I .git
 directory mounted on
-.I /mnt/git.
+.I $repo/.git/fs.
 Modifications to the repository are done directly to the
 .I .git
 directory, and are reflected in the file system interface.
@@ -304,7 +304,7 @@ flag serves repositories relative to
 
 .PP
 .B Git/fs 
-serves a file system on /mnt/git.
+serves a file system on $repo/.git/fs.
 For full documentation, see
 .IR gitfs (4)
 
@@ -363,6 +363,13 @@ option, the branch is created but the files are not checked out.
 When passed the
 .I -d
 option, the branch is deleted.
+.PP
+When switching branches, git/branch will refuse to clobber
+modificiations.
+Passing the
+.I -m
+option will cause git9 to attempt to merge the changes between
+the branches.
 
 .PP
 .B Git/log
diff --git a/sys/man/4/gitfs b/sys/man/4/gitfs
index 00c68edc3..7ba097ad0 100644
--- a/sys/man/4/gitfs
+++ b/sys/man/4/gitfs
@@ -20,7 +20,7 @@ Git/fs serves a file system interface to a git repository in the
 current directory.
 This file system provides a read-only view into the repository contents.
 By default, it is mounted on
-.B /mnt/git.
+.B $repo/.git/fs.
 It does not cache mutable data, so any changes to the git repository will immediately be reflected in git/fs.
 
 .PP
@@ -83,7 +83,7 @@ The git repository being expected.
 .B .git/HEAD
 A reference to the current HEAD.
 Used to populate
-.B /mnt/git/HEAD
+.B $repo/.git/fs/HEAD
 .TP
 .git/config
 The per-repository configuation for git tools.