code: plan9front

Info  •  Files  •  Log

git/rebase: remove unnecessary use of @ operator

Now that a..b handles the case where a isn't an ancestor of b, we
don't need to compute the LCA first.

--- a/sys/src/cmd/git/rebase

+++ b/sys/src/cmd/git/rebase

@@ -29,7 +29,7 @@

 	src=`{git/branch}

 	dst=`{git/query $1}

 	echo $src > .git/rebase.src

-	git/log -se $dst' '$src' @ .. '$src | sed 's/^/pick /' >.git/rebase.todo

+	git/log -se $dst'..'$src | sed 's/^/pick /' >.git/rebase.todo

 	if(! ~ $#interactive 0){

 		giteditor=`{git/conf core.editor}

 		if(~ $#editor 0)