git-merge(1), preserving all information about divergent development
that was later brought together.
-If you prefer linear histories, see dgit-maint-rebase(7).
+If you prefer linear histories, see dgit-maint-gbp(7)
+for a workflow based on git-buildpackage, or roll your own.
=item