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
(from parent 1:
195e21c
)
dgit-maint-debrebase(7): be consistent about referring to the tool
author
Sean Whitton
<spwhitton@spwhitton.name>
Thu, 19 Apr 2018 16:25:49 +0000
(09:25 -0700)
committer
Sean Whitton
<spwhitton@spwhitton.name>
Thu, 19 Apr 2018 16:43:59 +0000
(09:43 -0700)
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
dgit-maint-debrebase.7.pod
patch
|
blob
|
history
diff --git
a/dgit-maint-debrebase.7.pod
b/dgit-maint-debrebase.7.pod
index ec58507e6d6e8386d0c69f074a6d7d617d15b512..3c6e2fd00a84d399c4c1fd2a1a9a156a9ce4164d 100644
(file)
--- 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: