summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-02-22 18:35:02 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 12:25:49 +0100
commite1b9d828dd3e3ad28308114ba957f2acedc314ea (patch)
tree4ae97500310bcd3b92e89db1fe4b6b53b6b70bbf /git-debrebase
parent63911b5d576e7250c132d117c53e66aaf34b7f47 (diff)
git-debrebase: wip notes
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase12
1 files changed, 7 insertions, 5 deletions
diff --git a/git-debrebase b/git-debrebase
index fbb9732..71167e8 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -19,13 +19,15 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# 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] <upstreaminfo>
-# git-debrebase new-upstream [-f] <upstreaminfo>
+# git-debrebase new-upstream [-f] <upstreaminfo>...
# git-debrebase <git-rebase options> # does debrebase start if necessary
#
+# git-debrebase analyse
+# git-debrebase launder # prints breakwater tip
+# git-debrebase create-new-upstream-breakwater [-f] <upstreaminfo>...
+#
# <upstreaminfo> is
# [,][<subdir>:][+]<commitid>[,...]
#
@@ -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;
}