ref: f02778f3d7a1d12670995160d16db6cf51ac3db4
parent: 90192390f4a0a6d94468a7c3e988987ae29facb4
author: Ori Bernstein <[email protected]>
date: Tue Mar 24 00:22:51 EDT 2020
fix typos
--- a/merge
+++ b/merge
@@ -16,7 +16,7 @@
for(f in $all){ours=$ourbr/$f
base=$basebr/$f
- theirs=$thierbr/$f
+ theirs=$theirbr/$f
if(! test -f $ourbr/$f)
ours=/dev/null
if(! test -f $basebr/$f)
--- a/push
+++ b/push
@@ -50,10 +50,10 @@
if(~ $#branch 0)
die 'no branches'
updates=`$nl{git/send $force $branch $remove $remote || die $status}-
+echo $updates
for(ln in $updates){ u=`{echo $ln}- refpath=`{echo $u(2) | sed 's@^refs/heads/@.git/refs/remotes/@g'}+ refpath=`{echo $u(2) | sed 's@^refs/heads/@.git/refs/remotes/'$upstream'/@g'} switch($u(1)){case update;
echo $u(4) > $refpath