#!/bin/rc -x . /sys/lib/git/common.rc gitup flagfmt='r:resume'; args='onto' eval `''{aux/getflags $*} || exec aux/usage if(test -f .git/rebase.todo){ if(~ $#resume 0) die rebase in progress commits=`{cat .git/rebase.todo} } if not{ onto=$1 commits=`{git/query $onto $src @ .. $src} ## TODO: edit $commits here for -i } tmp=_rebase.working dst=`{git/query $onto} src=`{git/branch} git/branch -nb $dst $tmp #while(! ~ $#commmits 0){ c=$commits(1) if(! git/export $c | git/import){ echo $commits(2-) > .git/rebase.todo die $c: fix conflicts and git/rebase -r } } git/branch -nb $tmp $src git/branch -d $tmp