From: Sean Whitton Date: Thu, 19 Apr 2018 16:32:33 +0000 (-0700) Subject: dgit-maint-debrebase(7): add another "# if needed" X-Git-Tag: archive/debian/5.0~6^2~6 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=130db7d9bae45f6a5777c841dd97356b7335a98c;hp=a090117492eafad326684b0dc49f73184f52d148;p=dgit.git dgit-maint-debrebase(7): add another "# if needed" Signed-off-by: Sean Whitton --- diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index 3c6e2fd0..fb7c1e18 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -467,7 +467,7 @@ And for subsequent releases (whether or not they require filtering): % git checkout upstream-dfsg % git merge 1.2.4 % git rm further-evil.bin # if needed - % git commit -m "upstream version 1.2.4 DFSG-cleaned" + % git commit -m "upstream version 1.2.4 DFSG-cleaned" # if needed % git tag -s 1.2.4+dfsg % git checkout master % # proceed with "Importing the release"