X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase.1.pod;h=af6e3646ad32e04b552931b2249454dbb604ca84;hb=cd8e216085a98334b6d167b958127ffa8756062a;hp=aa7f459b84db35c3c324915f1397d12affd681d1;hpb=31baa0b8668d76d78cc7edb9438b8384cc7d3090;p=dgit.git diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index aa7f459b..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 @@ -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).