diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2018-07-19 01:09:16 +0800 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-07-19 01:09:16 +0800 |
| commit | d0492d8f40b05ea5f4d378cd34221a9cd66cbfcd (patch) | |
| tree | d79f415f344a81aca8d18e916b7016a84aec5793 /git-debrebase.1.pod | |
| parent | eb07108c1051f227c83de01781f498a330faae43 (diff) | |
| parent | 15fbfc94b8c6a08cffdf0f9a7ed5870252ad4416 (diff) | |
Merge tag 'debian/5.10' into stretch-bpo
dgit release 5.10 for unstable (sid) [dgit]
[dgit distro=debian]
# gpg: Signature made Sun 15 Jul 2018 01:12:02 AM CST
# gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key
Diffstat (limited to 'git-debrebase.1.pod')
| -rw-r--r-- | git-debrebase.1.pod | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 4d1a673..273ef47 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -257,9 +257,18 @@ This check exists to detect certain likely user errors, but if this situation is true and expected, forcing it is fine. +git-debrebase will try to look for the dgit archive view +of the most recent release, +and if it finds it will make a pseduomerge so that +your new git-debrebase view is appropriately fast forward. + The result is a well-formed git-debrebase interchange branch. The result is also fast-forward from the gbp branch. +It is a snag if the new branch looks like it will have diverged, +just as for a laundering/unstitching call to git-debrebase; +See L</Establish the current branch's ffq-prev>, below. + Note that it is dangerous not to know whether you are dealing with a gbp patches-unappled branch containing quilt patches, or a git-debrebase interchange branch. |