chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
po4a: Fix gitignore to actually ignore right .po4a.LANG.cfg
[dgit.git]
/
git-debrebase.5.pod
diff --git
a/git-debrebase.5.pod
b/git-debrebase.5.pod
index f641a70fe756fd8147c82e86c40335d26041c29b..439fd63b89b30155960ae5821c6f19ca3571b677 100644
(file)
--- a/
git-debrebase.5.pod
+++ b/
git-debrebase.5.pod
@@
-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 what a problem is.
+To determine whether a branch is
+is being maintained in git-debrebase form
+it is necessary to walk its history.
=head1 OTHER MERGES
=head1 OTHER MERGES
@@
-551,21
+554,21
@@
in the messages of commits it generates.
The general form is
The general form is
- [git-debrebase
[ COMMIT-TYPE [ ARGS...]
]: PROSE, MORE PROSE]
+ [git-debrebase
COMMIT-TYPE [ ARGS...
]: PROSE, MORE PROSE]
git-debrebase treats anything after the colon as a comment,
paying no attention to PROSE.
The full set of annotations is:
git-debrebase treats anything after the colon as a comment,
paying no attention to PROSE.
The full set of annotations is:
- [git-debrebase
: split
mixed commit, debian part]
- [git-debrebase
: split
mixed commit, upstream-part]
- [git-debrebase
: convert dgit import,
debian changes]
+ [git-debrebase
split:
mixed commit, debian part]
+ [git-debrebase
split:
mixed commit, upstream-part]
+ [git-debrebase
onvert dgit import:
debian changes]
[git-debrebase anchor: convert dgit import, upstream changes]
[git-debrebase upstream-combine . PIECE[ PIECE...]: new upstream]
[git-debrebase anchor: new upstream NEW-UPSTREAM-VERSION, merge]
[git-debrebase anchor: convert dgit import, upstream changes]
[git-debrebase upstream-combine . PIECE[ PIECE...]: new upstream]
[git-debrebase anchor: new upstream NEW-UPSTREAM-VERSION, merge]
- [git-debrebase
: new upstream NEW-UPSTREAM-VERSION, changelog
]
- [git-debrebase: export and commit patches]
+ [git-debrebase
changelog: new upstream NEW-UPSTREAM-VERSION
]
+ [git-debrebase
make-patches
: export and commit patches]
[git-debrebase convert-from-gbp: drop patches]
[git-debrebase anchor: declare upstream]
[git-debrebase convert-from-gbp: drop patches]
[git-debrebase anchor: declare upstream]
@@
-574,6
+577,8
@@
The full set of annotations is:
[git-debrebase merged-breakwater: constructed from vanilla merge]
[git-debrebase convert-to-gbp: commit patches]
[git-debrebase merged-breakwater: constructed from vanilla merge]
[git-debrebase convert-to-gbp: commit patches]
+ [git-debrebase convert-from-dgit-view upstream-import-convert: VERSION]
+ [git-debrebase convert-from-dgit-view drop-patches]
Only anchor merges have the C<[git-debrebase anchor: ...]> tag.
Single-parent anchors are not generated by git-debrebase,
Only anchor merges have the C<[git-debrebase anchor: ...]> tag.
Single-parent anchors are not generated by git-debrebase,