X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fhowto%2Fusing-merge-subtree.txt;h=1ae8d1214ec0e8db1979a7770cf7602403358636;hb=a7793a749115ead3b8f7447ce1e96572ea5d8ea3;hp=2933056120bf0a0d6249c6951ab1e964ae40674b;hpb=92622e62145b05a159b057a4334205e6a3b07630;p=git.git diff --git a/Documentation/howto/using-merge-subtree.txt b/Documentation/howto/using-merge-subtree.txt index 293305612..1ae8d1214 100644 --- a/Documentation/howto/using-merge-subtree.txt +++ b/Documentation/howto/using-merge-subtree.txt @@ -25,7 +25,7 @@ What you want is the 'subtree' merge strategy, which helps you in such a situation. In this example, let's say you have the repository at `/path/to/B` (but -it can be an URL as well, if you want). You want to merge the 'master' +it can be a URL as well, if you want). You want to merge the 'master' branch of that repository to the `dir-B` subdirectory in your current branch.