chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changelog: Document typo fixes.
[dgit.git]
/
git-debrebase.5.pod
diff --git
a/git-debrebase.5.pod
b/git-debrebase.5.pod
index e3ed30930b43c81d90556de5b747e092a04122bd..d23c6b21b6787b87fcc2fe9cba503f19b47f3bda 100644
(file)
--- a/
git-debrebase.5.pod
+++ b/
git-debrebase.5.pod
@@
-146,7
+146,7
@@
See L</STITCHING, PSEUDO-MERGES, FFQ RECORD>.
git-debrebase has one primary branch,
the B<interchange branch>.
git-debrebase has one primary branch,
the B<interchange branch>.
-This branch is found on Debian contributor
's
workstations
+This branch is found on Debian contributor
s'
workstations
(typically, a maintainer would call it B<master>),
in the Debian dgit git server as the suite branch (B<dgit/dgit/sid>)
and on other git servers which support Debian work
(typically, a maintainer would call it B<master>),
in the Debian dgit git server as the suite branch (B<dgit/dgit/sid>)
and on other git servers which support Debian work
@@
-175,7
+175,7
@@
the upstream commits).
The breakwater does not contain any representation of
the delta queue (not even debian/patches).
The part of the breakwater processed by git-debrebase
The breakwater does not contain any representation of
the delta queue (not even debian/patches).
The part of the breakwater processed by git-debrebase
-is the part since the most re
e
cent B<anchor>,
+is the part since the most recent B<anchor>,
which is usually a special merge generated by git-debrebase.
When working, locally,
which is usually a special merge generated by git-debrebase.
When working, locally,
@@
-255,7
+255,7
@@
a representation of the delta queue:
=item Delta queue commits
Zero or more single-parent commits
=item Delta queue commits
Zero or more single-parent commits
-contai
o
ning only changes to upstream files.
+containing only changes to upstream files.
=back
=back
@@
-266,7
+266,7
@@
branch state is also B<rebasing>.
It has the same contents as the laundered state,
except that it may contain,
additionally,
It has the same contents as the laundered state,
except that it may contain,
additionally,
-
in
B<in any order but after the breakwater>:
+B<in any order but after the breakwater>:
=over
=over
@@
-378,8
+378,11
@@
from the interchange branch and no pseudomerge is needed.
When ffq-prev is not present,
C<refs/debrebase-last/B> records some ancestor of refs/B,
(usually, the result of last stitch).
When ffq-prev is not present,
C<refs/debrebase-last/B> records some ancestor of refs/B,
(usually, the result of last stitch).
-This can be used to quickly determine whether refs/B
-is being maintained in git-debrebase form.
+This is used for status printing and some error error checks -
+especially for printing guesses about what a problem is.
+To determine whether a branch
+is being maintained in git-debrebase form
+it is necessary to walk its history.
=head1 OTHER MERGES
=head1 OTHER MERGES
@@
-416,7
+419,7
@@
so we can at least detect unsupported merges.
=head1 LEGAL OPERATIONS
=head1 LEGAL OPERATIONS
-The following basic operations follow
s
from this model
+The following basic operations follow from this model
(refer to the diagram above):
=over
(refer to the diagram above):
=over
@@
-469,7
+472,7
@@
so that git log shows the packaging history.)
=item Stitch
Make a pseudomerge,
=item Stitch
Make a pseudomerge,
-whose contributing parent
to
is the unstitched branch
+whose contributing parent is the unstitched branch
and
whose overwritten parent is ffq-prev,
consuming ffq-prev in the process
and
whose overwritten parent is ffq-prev,
consuming ffq-prev in the process
@@
-480,7
+483,7
@@
or perhaps a laundered branch with a quilt patch addition commit.
=item Commit quilt patches
To generate a tree which can be represented as a
=item Commit quilt patches
To generate a tree which can be represented as a
-3.0 (quilt) .dsc source package
s
,
+3.0 (quilt) .dsc source package,
the delta queue must be reified inside the git tree
in B<debian/patches/>.
These patch files can be stripped out and/or regenerated as needed.
the delta queue must be reified inside the git tree
in B<debian/patches/>.
These patch files can be stripped out and/or regenerated as needed.
@@
-512,7
+515,7
@@
For these reasons,
it is better to use git-debrebase and
let it choose the base
for your rebase.
it is better to use git-debrebase and
let it choose the base
for your rebase.
-If you do realise you have ma
k
e this mistake,
+If you do realise you have ma
d
e this mistake,
it is best to use the reflog to recover to a suitable
good previous state.
it is best to use the reflog to recover to a suitable
good previous state.