chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git fetching: Tidy up a redundant list in git_lrfetch_sane
[dgit.git]
/
dgit-maint-merge.7.pod
diff --git
a/dgit-maint-merge.7.pod
b/dgit-maint-merge.7.pod
index cb147b0a591b0e66a1563c1535328254b30bf363..dc5bfa34043dd1dac121f416b3d2bc3ce444c0ad 100644
(file)
--- a/
dgit-maint-merge.7.pod
+++ b/
dgit-maint-merge.7.pod
@@
-187,6
+187,7
@@
this workflow. It should be skipped when debianising a new package.
% dgit clone foo
% cd foo
% dgit clone foo
% cd foo
+ % git remote add -f upstream https://some.upstream/foo.git
=back
=back
@@
-217,7
+218,7
@@
To achieve this, you might need to delete
I<debian/source/local-options>. One way to have dgit check your
progress is to run B<dgit build-source>.
I<debian/source/local-options>. One way to have dgit check your
progress is to run B<dgit build-source>.
-The dgit push will require I<--overwrite>.
+The
first
dgit push will require I<--overwrite>.
=head1 SOURCE PACKAGE CONFIGURATION
=head1 SOURCE PACKAGE CONFIGURATION