X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-maint-merge.7.pod;h=cb147b0a591b0e66a1563c1535328254b30bf363;hp=5867a6b3ab681f7bed23a756fafef987192ab1ba;hb=91e7b53b3c66102c4bc06bec5cd7db13a35dc63a;hpb=568d065af3a870c52c0b670603fd8853e7cc2a14 diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index 5867a6b3..cb147b0a 100644 --- a/dgit-maint-merge.7.pod +++ b/dgit-maint-merge.7.pod @@ -201,6 +201,14 @@ First, dump any existing patch queue: =back +Then make new upstream tags available: + +=over 4 + + % git remote add -f upstream https://some.upstream/foo.git + +=back + Now you simply need to ensure that your git HEAD is dgit-compatible, i.e., it is exactly what you would get if you ran B and then unpacked the resultant source package. @@ -209,6 +217,8 @@ To achieve this, you might need to delete I. One way to have dgit check your progress is to run B. +The dgit push will require I<--overwrite>. + =head1 SOURCE PACKAGE CONFIGURATION =head2 debian/source/options