chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test suite: tagupl: A few more error case tests
[dgit.git]
/
git-debrebase.1.pod
diff --git
a/git-debrebase.1.pod
b/git-debrebase.1.pod
index e5b84a0b140b9fc6067d8c3649716707d9f9078e..af6e3646ad32e04b552931b2249454dbb604ca84 100644
(file)
--- a/
git-debrebase.1.pod
+++ b/
git-debrebase.1.pod
@@
-370,7
+370,7
@@
and any ffq-prev is deleted.
This is provided mostly for the test suite
and for unusual situations.
This is provided mostly for the test suite
and for unusual situations.
-It should
be used only
with care and
+It should
only be used
with care and
with a proper understanding of the underlying theory.
Be sure to not accidentally treat the result as
with a proper understanding of the underlying theory.
Be sure to not accidentally treat the result as
@@
-420,7
+420,7
@@
failure to find an appropriate upstream.
Directory to look in for orig tarballs.
The default is the git config option
dgit.default.build-products-dir
Directory to look in for orig tarballs.
The default is the git config option
dgit.default.build-products-dir
-or failing that,
"C<..>"
.
+or failing that,
C<..>
.
Passed on to dgit, if git-debrebase invokes dgit.
=item --[no-]origs
Passed on to dgit, if git-debrebase invokes dgit.
=item --[no-]origs
@@
-531,7
+531,7
@@
This is provided mostly for the benefit of the test suite.
Requests (more) debugging. May be repeated.
Requests (more) debugging. May be repeated.
-=item --experimntal-merge-resolution
+=item --experim
e
ntal-merge-resolution
Enable experimental code for handling general merges
(see L<git-debrebase(5)/General merges>).
Enable experimental code for handling general merges
(see L<git-debrebase(5)/General merges>).