X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase.1.pod;h=6f328dd9b0da015e569c2e27790c43f33c4a1506;hb=e82d9492c0a63d75c96e2ebdbc93300d57927d60;hp=aa7f459b84db35c3c324915f1397d12affd681d1;hpb=31baa0b8668d76d78cc7edb9438b8384cc7d3090;p=dgit.git diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index aa7f459b..6f328dd9 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). @@ -619,6 +619,6 @@ The result is the laundered branch. =head1 SEE ALSO git-debrebase(1), -dgit-maint-rebase(7), +dgit-maint-debrebase(7), dgit(1), gitglossary(7)