diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2018-04-19 09:25:49 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-04-19 09:43:59 -0700 |
commit | a090117492eafad326684b0dc49f73184f52d148 (patch) | |
tree | 27189cbffe82f9fb78478847548727427dbe48c8 /dgit-maint-debrebase.7.pod | |
parent | 195e21c55a52a651d66e5d7278b5feb0cb5ebfab (diff) |
dgit-maint-debrebase(7): be consistent about referring to the tool
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
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: |