diff options
| author | Guido Günther <agx@sigxcpu.org> | 2018-01-17 15:26:54 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2018-01-17 15:26:54 +0100 |
| commit | 17914a9903bc5855b0c596c86f7351b463d02a6b (patch) | |
| tree | 290ee4865a3ba5e69ddd2fe661861b0e11348abf | |
| parent | c8dbfe1281926b45000360727e94d71f9a56deb0 (diff) | |
docs: Although imported trees are important we mean the former
Closes: #887499
Thanks: Ferenc Wágner
| -rw-r--r-- | docs/manpages/gbp-import-orig.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/manpages/gbp-import-orig.xml b/docs/manpages/gbp-import-orig.xml index 04db197e..7eccf6aa 100644 --- a/docs/manpages/gbp-import-orig.xml +++ b/docs/manpages/gbp-import-orig.xml @@ -142,7 +142,7 @@ identical to the newly imported tree but preserves the content of the <filename>debian/</filename> directory while keeping the current head as well as the newly - important trees as parents of the generated commit. This is + imported tree as parents of the generated commit. This is similar to a <option>theirs</option> merge strategy while preserving <filename>debian/</filename>. </para> |