From 1c679c975b3d6a040420e000705a62da4027ffd2 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 28 Apr 2017 14:13:37 +0100 Subject: [PATCH] git-debrebase: wip found --- git-debrebase | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/git-debrebase b/git-debrebase index 9ec909fa..87d605b6 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; -- 2.30.2