diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2018-04-03 11:07:19 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-04-19 09:43:51 -0700 |
commit | 70955b803c88299a945bc9f9d96a7846314ced03 (patch) | |
tree | fc027faa767380f1aae9432e9fde956f5df20336 /dgit-maint-debrebase.7.pod | |
parent | 233d2b5eea7060eebff598c9edfa5ae659cb7a77 (diff) |
dgit-maint-debrebase(7): it's an example
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'dgit-maint-debrebase.7.pod')
-rw-r--r-- | dgit-maint-debrebase.7.pod | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index 0b75d58..cd470ce 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -55,9 +55,9 @@ This workflow is appropriate for packages where the Debian delta contains multiple pieces which interact, or which you don't expect to be able to upstream soon. For packages with simple and/or short-lived Debian deltas, use of git-debrebase(1) might introduce unneeded -complexity -- in particular, you cannot use B<git merge> to -incorporate changes from other contributors. For such packages, -consider the workflow described in dgit-maint-merge(7). +complexity -- for example, you cannot use B<git merge> to incorporate +changes from other contributors. For such packages, consider the +workflow described in dgit-maint-merge(7). =head1 INITIAL DEBIANISATION |