diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 18:41:40 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 18:50:34 +0100 |
| commit | e66c2cf3f7182a3e6f52945636a807ed4a959d5b (patch) | |
| tree | 4f07998cf94817851dba90e7004915ca52dc5ab4 /git-debrebase.1.pod | |
| parent | 76b47400a06d576939c8b010cdec1c506714e780 (diff) | |
git-debrebase: `prepush' is now a silent no-op if unstitched.
This is more friendly. Update the docs accordingly.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase.1.pod')
| -rw-r--r-- | git-debrebase.1.pod | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index fe65674..ca81c19 100644 --- 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>] +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. -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. -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 |