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: Reorganise and tidy up the current entry
[dgit.git]
/
git-debrebase.5.pod
diff --git
a/git-debrebase.5.pod
b/git-debrebase.5.pod
index d39ad9484986fb022e98e735a030d91f6e136063..751529e1a042770af75e8deda5f67f74cf151a73 100644
(file)
--- a/
git-debrebase.5.pod
+++ b/
git-debrebase.5.pod
@@
-556,6
+556,8
@@
The full set of annotations is:
[git-debrebase anchor: declare upstream]
[git-debrebase pseudomerge: stitch]
[git-debrebase anchor: declare upstream]
[git-debrebase pseudomerge: stitch]
+ [git-debrebase merged-breakwater: constructed from vanilla merge]
+
[git-debrebase convert-to-gbp: commit patches]
Only anchor merges have the C<[git-debrebase anchor: ...]> tag.
[git-debrebase convert-to-gbp: commit patches]
Only anchor merges have the C<[git-debrebase anchor: ...]> tag.