chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: Do not mind stitching an unlaundered branch
[dgit.git]
/
git-debrebase.1.pod
diff --git
a/git-debrebase.1.pod
b/git-debrebase.1.pod
index 73251706a73c1036ee8a00a87ea43db4bb2da11b..9f82a7c311365bc43b171891d3294cc34be1dfb0 100644
(file)
--- 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.
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>...]
=item git-debrebase new-upstream-v0 <new-version> [<upstream-details>...]