diff options
| -rwxr-xr-x | git-debrebase | 2 | ||||
| -rw-r--r-- | git-debrebase.1.pod | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/git-debrebase b/git-debrebase index 5aaa660..c02fe8a 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1316,7 +1316,7 @@ sub cmd_stitch () { my $prose = 'stitch'; GetOptions('prose=s', \$prose) or die badusage("bad options to stitch"); badusage "no arguments allowed" if @ARGV; - do_stitch $prose, \&snag; + do_stitch $prose, 0; } sub cmd_prepush () { cmd_stitch(); } diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 7325170..9f82a7c 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -84,7 +84,8 @@ This is a good command to run before pushing to a git server. If there is no ffq-prev, it is an error, unless --noop-ok. -It is a snag (see B<-f>) if the branch is not laundered. +You should consider using B<conclude> instead, +because that launders the branch too. =item git-debrebase new-upstream-v0 <new-version> [<upstream-details>...] |