X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fcvs-migration.txt;h=fa94efde8dfd75a4eee7ddd62f110d5da39ef360;hb=90768daaa006516c7ae69ed89d7c2e67243dfac1;hp=2bd58d3fd8aefb68d1d49c099805178b02c4218c;hpb=b8bc67cef31453233f1ff6722c0bd3c99df44756;p=git.git diff --git a/Documentation/cvs-migration.txt b/Documentation/cvs-migration.txt index 2bd58d3f..fa94efde 100644 --- a/Documentation/cvs-migration.txt +++ b/Documentation/cvs-migration.txt @@ -140,7 +140,7 @@ You can update the shared repository with your changes using: $ git push origin master ------------------------------------------------ -If some else has updated the repository more recently, `git push`, like +If someone else has updated the repository more recently, `git push`, like `cvs commit`, will complain, in which case you must pull any changes before attempting the push again.