From: Ian Jackson Date: Fri, 28 Apr 2017 13:13:37 +0000 (+0100) Subject: wip found X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=371c0e58de4326e5cde0cea95d01e71aed13d129;p=dgit.git wip found --- diff --git a/git-debrebase b/git-debrebase index a9f7a1ab..03e40404 100755 --- a/git-debrebase +++ b/git-debrebase @@ -63,7 +63,7 @@ # - no fast forward checks # for now only explicit with commitids - # implicitly uses `upstream' +# implicitly uses `upstream' # # (or multiple other branches) # git-debrebase new-upstream \ # [/]= @@ -89,8 +89,10 @@ # zero, one, or both of these may exist s # git-debrebase without start, if already started, is willing -# to strip pseudomerges provided that they overwrite (xxx exactly ???) +# to strip pseudomerges provided that they overwrite exactly # the previous HEAD +# xxxx is this right ? what matters is have we pushed +# the previous pseudomerge check for tags and remote branches ? use strict;