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=f785af7ad97282fb47f14c5e70441fc0ea903799;hb=3cc7776cbcc8f2fd0921f823ff4fddb186704bb9;hpb=52046de403b82e8ef608e62f4cb7ec8c38b10c56 diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index f785af7a..8794d1d0 100644 --- a/dgit-maint-merge.7.pod +++ b/dgit-maint-merge.7.pod @@ -16,8 +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-rebase(7). - =item Maintaining convenient and powerful git workflows takes priority over