diff options
Diffstat (limited to 'git-debrebase.5.pod')
| -rw-r--r-- | git-debrebase.5.pod | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod index d39ad94..439fd63 100644 --- 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). -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 @@ -527,6 +530,21 @@ If you add patches your work is likely to be discarded. Instead of editing patches, use git-debrebase to edit the corresponding commits. +=item Renaming (etc.) branch while unstitched + +The previous HEAD, +which will be pseudomerged over +by operations like git-debrebase stitch, +is recorded in a ref name dervied from your branch name. + +If you rename unstitched branches, +this information can get out of step. + +Conversely, +creating a new branch from an unstitched branch +is good for making a branch to play about in, +but the result cannot be stitched. + =back =head1 COMMIT MESSAGE ANNOTATIONS @@ -536,27 +554,31 @@ in the messages of commits it generates. 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: 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: 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 pseudomerge: stitch] + [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, |