X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-maint-merge.7.pod;h=8794d1d0539287fcb527ea4599ccfb622d9deabc;hp=03ccdfe84acb0e2e4310f455d5307293d7e8bd26;hb=a98d0e0d68a2167e9909ec2da04ebf56c7f97b6f;hpb=3bdf06f4ea6d3735c73c12903e3ac7ce8447f61a;ds=sidebyside diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index 03ccdfe8..8794d1d0 100644 --- a/dgit-maint-merge.7.pod +++ b/dgit-maint-merge.7.pod @@ -16,9 +16,6 @@ Git histories should be the non-linear histories produced by git-merge(1), preserving all information about divergent development that was later brought together. -If you prefer linear histories, see dgit-maint-gbp(7) -for a workflow based on git-buildpackage, or roll your own. - =item Maintaining convenient and powerful git workflows takes priority over