X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase.1.pod;h=af6e3646ad32e04b552931b2249454dbb604ca84;hb=659ee48727f1e397262d195d17385f571c84fa4f;hp=e5b84a0b140b9fc6067d8c3649716707d9f9078e;hpb=9e94228f893936a65dea1a05758e523dc7e7d22f;p=dgit.git diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index e5b84a0b..af6e3646 100644 --- 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. -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 @@ -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 -or failing that, "C<..>". +or failing that, C<..>. 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. -=item --experimntal-merge-resolution +=item --experimental-merge-resolution Enable experimental code for handling general merges (see L).