From 42a42572cb11e5481d51fecc94daa1ca8f39b2da Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 19 Feb 2018 01:56:44 +0000 Subject: [PATCH] git-debrebase(5): minor improvements Signed-off-by: Ian Jackson --- git-debrebase.5.pod | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod index 6d61baad..fb9cff29 100644 --- a/git-debrebase.5.pod +++ b/git-debrebase.5.pod @@ -229,16 +229,16 @@ when it imports .dsc-based uploads. =head1 STITCHING, PSEUDO-MERGES, FFQ RECORD Whenever the branch C is unstitched, -the previous tip is recorded in the git ref C. +the previous tip is recorded in the git ref C. Unstiched branches are not fast forward from the published -interchange branches. [1] +interchange branches [1]. 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, or both. +(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 in B. -(These can be stripped out and/or regenerated as needed.) +These patch files can be stripped out and/or regenerated as needed. =back -- 2.30.2