chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e31362a
)
dgit-maint-merge(7): Tweak wording
author
Sean Whitton
<spwhitton@spwhitton.name>
Thu, 20 Oct 2016 02:51:58 +0000
(19:51 -0700)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 20 Oct 2016 19:07:36 +0000
(20:07 +0100)
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
dgit-maint-merge.7.pod
patch
|
blob
|
history
diff --git
a/dgit-maint-merge.7.pod
b/dgit-maint-merge.7.pod
index 71f701e196a2196db084db9c106587b269a424a3..642b39ece3b39e8a55ec22e5413bd16f692c6dfe 100644
(file)
--- a/
dgit-maint-merge.7.pod
+++ b/
dgit-maint-merge.7.pod
@@
-194,7
+194,7
@@
changes to the upstream source:
The Debian packaging of foo is maintained using dgit. For the sake of
an efficient workflow, Debian modifications to the upstream source are
-squashed into a single
patch
, rather than a series of quilt patches.
+squashed into a single
diff
, rather than a series of quilt patches.
To obtain a patch queue for package version 1.2.3-1:
=over 4