Commit graph

3 commits

Author SHA1 Message Date
Ori Bernstein
a5282f9eab git/{branch,pull}: merge files correctly
merge1 would clobber the global '$base' variable,
which is not what we wanted. Run it in a subshell
with its own env.
2021-06-05 17:42:05 +00:00
Ori Bernstein
12e952e684 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.
2021-05-30 17:46:21 -07:00
Ori Bernstein
54cafd2106 git: add missing file
Forgot to add common.rc in the initial commit.
2021-05-17 13:46:44 -07:00