diff options
| author | Ori Bernstein <ori@eigenstate.org> | 2021-05-30 17:46:21 -0700 |
|---|---|---|
| committer | Ori Bernstein <ori@eigenstate.org> | 2021-05-30 17:46:21 -0700 |
| commit | 12e952e684d149628360b6fcdb583be86052f944 (patch) | |
| tree | b7ede146e2d145c9dcdc92a80e1a92d2be869aad /sys/man/1/git | |
| parent | 1af2546e96fa96ec5341026dd509c9e4ed54c6db (diff) | |
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.
Diffstat (limited to 'sys/man/1/git')
| -rw-r--r-- | sys/man/1/git | 13 |
1 files changed, 10 insertions, 3 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 |