chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
dgit-maint-debrebase(7): Drop bad advice about upstream/ tag case
[dgit.git]
/
dgit-maint-debrebase.7.pod
diff --git
a/dgit-maint-debrebase.7.pod
b/dgit-maint-debrebase.7.pod
index 373fb2f7aa335456d09aee970e4d4f05b4972021..fdbf2e8d70b9da58d6afab8972496b2cb5949067 100644
(file)
--- a/
dgit-maint-debrebase.7.pod
+++ b/
dgit-maint-debrebase.7.pod
@@
-394,8
+394,6
@@
or if you have a working watch file
=back
-replacing I<1.2.3> with I<upstream/1.2.3> if you imported a tarball.
-
This invocation of git-debrebase(1) involves a git rebase. You may
need to resolve conflicts if the Debian delta queue does not apply
cleanly to the new upstream source.