diff options
Diffstat (limited to 'dgit-maint-debrebase.7.pod')
| -rw-r--r-- | dgit-maint-debrebase.7.pod | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index ec58507..3c6e2fd 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -262,7 +262,7 @@ The first dgit push will require I<--overwrite>. =head1 GIT CONFIGURATION -git-debrebase does not yet support using B<git merge> to merge +git-debrebase(1) does not yet support using B<git merge> to merge divergent branches of development (see "OTHER MERGES" in git-debrebase(5)). You should configure git such that B<git pull> does not try to merge: |