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: `prepush' is now a silent no-op if unstitched.
[dgit.git]
/
git-debrebase.1.pod
diff --git
a/git-debrebase.1.pod
b/git-debrebase.1.pod
index fe65674735838fa3fe67566a5edf62e6550170bc..ca81c19780a531e5c88215bbbab6f770c61e9560 100644
(file)
--- a/
git-debrebase.1.pod
+++ b/
git-debrebase.1.pod
@@
-95,16
+95,22
@@
If the branch is already laundered and stitched, does nothing.
=item git-debrebase prepush [--prose=<for commit message>]
=item git-debrebase prepush [--prose=<for commit message>]
+If the branch is unstitched,
+stitches it,
+consuming ffq-prev.
+
+This is a good command to run before pushing to a git server.
+You should consider using B<conclude> instead,
+because that launders the branch too.
+
=item git-debrebase stitch [--prose=<for commit message>]
Stitches the branch,
consuming ffq-prev.
=item git-debrebase stitch [--prose=<for commit message>]
Stitches the branch,
consuming ffq-prev.
-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.
-You should consider using B<conclude> instead,
-because that launders the branch too.
+You should consider using B<prepush> or B<conclude> instead.
=item git-debrebase scrap
=item git-debrebase scrap