diff options
Diffstat (limited to 'Documentation/gitcvs-migration.txt')
| -rw-r--r-- | Documentation/gitcvs-migration.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/gitcvs-migration.txt b/Documentation/gitcvs-migration.txt index d65265835d..518d5d6d19 100644 --- a/Documentation/gitcvs-migration.txt +++ b/Documentation/gitcvs-migration.txt @@ -47,7 +47,7 @@ them first before running git pull. [NOTE] ================================ The `pull` command knows where to get updates from because of certain -configuration variables that were set by the first `git clone` +configuration variables that were set by the first `git-clone` command; see `git config -l` and the linkgit:git-config[1] man page for details. ================================ @@ -60,12 +60,12 @@ $ git push origin master ------------------------------------------------ to "push" those commits to the shared repository. If someone else has -updated the repository more recently, `git push`, like `cvs commit`, will +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. -In the `git push` command above we specify the name of the remote branch -to update (`master`). If we leave that out, `git push` tries to update +In the `git-push` command above we specify the name of the remote branch +to update (`master`). If we leave that out, `git-push` tries to update any branches in the remote repository that have the same name as a branch in the local repository. So the last `push` can be done with either of: |