X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=Documentation%2Fhowto%2Frevert-a-faulty-merge.txt;h=6fd711996a775d1da8ab2051db98896a601c8971;hb=006f424b2d014b8a7c4887b7ddbb57256dd6b8c7;hp=ff5c0bc27a416de16f106c15b9076082c6509e42;hpb=037c43c68e220739e690540de89a6d5835fefe73;p=git.git diff --git a/Documentation/howto/revert-a-faulty-merge.txt b/Documentation/howto/revert-a-faulty-merge.txt index ff5c0bc27..6fd711996 100644 --- a/Documentation/howto/revert-a-faulty-merge.txt +++ b/Documentation/howto/revert-a-faulty-merge.txt @@ -229,7 +229,7 @@ reverting W. Mainline's history would look like this: A---B---C But if you don't actually need to change commit A, then you need some way to -recreate it as a new commit with the same changes in it. The rebase commmand's +recreate it as a new commit with the same changes in it. The rebase command's --no-ff option provides a way to do this: $ git rebase [-i] --no-ff P