From: Ian Jackson Date: Wed, 22 Feb 2017 18:35:02 +0000 (+0000) Subject: git-debrebase: wip notes X-Git-Tag: archive/debian/5.0~378 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=e1b9d828dd3e3ad28308114ba957f2acedc314ea git-debrebase: wip notes --- diff --git a/git-debrebase b/git-debrebase index fbb97329..71167e89 100755 --- a/git-debrebase +++ b/git-debrebase @@ -19,13 +19,15 @@ # along with this program. If not, see . # usages: -# git-debrebase launder # prints breakwater tip -# git-debrebase analyse +# git-debrebase status # git-debrebase start # like ffrebase start + debrebase launder -# git-debrebase create-new-upstream [-f] -# git-debrebase new-upstream [-f] +# git-debrebase new-upstream [-f] ... # git-debrebase # does debrebase start if necessary # +# git-debrebase analyse +# git-debrebase launder # prints breakwater tip +# git-debrebase create-new-upstream-breakwater [-f] ... +# # is # [,][:][+][,...] # @@ -414,7 +416,7 @@ sub update_head ($$) { sub cmd_launder () { my $old = get_head(); my ($tip,$breakwater) = launder $old, 0, undef, 0; - update_head $old, $tip, 'launder'; # no tree changes! + update_head $old, $tip, 'launder'; # no tree changes! xxx debian/patches printf "# breakwater tip:\n%s\n", $breakwater; }