|author||Ian Jackson <firstname.lastname@example.org>||2018-02-19 01:56:44 +0000|
|committer||Ian Jackson <email@example.com>||2018-06-16 16:07:00 +0100|
git-debrebase(5): minor improvements
Signed-off-by: Ian Jackson <firstname.lastname@example.org>
Diffstat (limited to 'git-debrebase.5.pod')
1 files changed, 6 insertions, 4 deletions
diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod
index 6d61baa..fb9cff2 100644
@@ -229,16 +229,16 @@ when it imports .dsc-based uploads.
=head1 STITCHING, PSEUDO-MERGES, FFQ RECORD
Whenever the branch C<refs/B> is unstitched,
-the previous tip is recorded in the git ref C<refs/ffq-prev/heads/B>.
+the previous tip is recorded in the git ref C<refs/ffq-prev/B>.
Unstiched branches are not fast forward from the published
-interchange branches. 
+interchange branches .
So before a branch can be pushed,
the right pseudomerge must be reestablished.
This is the stitch operation,
which consumes the ffq-prev ref.
-When the user has an unstituched branch,
+When the user has an unstitched branch,
they may rewrite it freely,
from the breakwater tip onwards.
Such a git rebase is the default operation for git-debrebase.
@@ -299,6 +299,8 @@ it is always fine to simply git commit
commits containing upstream file changes, packaging changes,
+(This may make the branch unlaundered.)
=item Launder branch
Record the previous tip in ffq-prev,
@@ -348,7 +350,7 @@ To generate a tree which can be represented as a
3.0 (quilt) .dsc source packages,
the delta queue must be reified inside the git tree
-(These can be stripped out and/or regenerated as needed.)
+These patch files can be stripped out and/or regenerated as needed.