]> git.lizzy.rs Git - plan9front.git/commit
projects / plan9front.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5d06e7a) | patch
git/{branch,pull}: merge files correctly
authorOri Bernstein <ori@eigenstate.org>
Sat, 5 Jun 2021 17:42:05 +0000 (17:42 +0000)
committerOri Bernstein <ori@eigenstate.org>
Sat, 5 Jun 2021 17:42:05 +0000 (17:42 +0000)
commita5282f9eab1b78bd65e5144c81bf0f19b3f9efaf
tree3bdf47447ea08d81b862c47c3767760b44b89c17tree | snapshot
parent5d06e7ad66f2dad04f25948bcdc256f812c47590commit | diff
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.
sys/lib/git/common.rc diff | blob | history
some kind of operating system. [Forked from http://git.9front.org/plan9front/plan9front/HEAD/info.html]