aboutsummaryrefslogtreecommitdiff
path: root/Documentation/gitcvs-migration.txt
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2010-01-10 00:33:00 +0100
committerThomas Rast <trast@student.ethz.ch>2010-01-10 13:01:28 +0100
commit0b444cdb19bcfcc7f59b7b00783cbfbbc5ddcf63 (patch)
treefbc79ccb4f6e809a560bd807c4a17dd6e6681161 /Documentation/gitcvs-migration.txt
parentca768288b650a4929bc1d58783a929a9a792e30e (diff)
downloadgit-0b444cdb19bcfcc7f59b7b00783cbfbbc5ddcf63.tar.gz
git-0b444cdb19bcfcc7f59b7b00783cbfbbc5ddcf63.tar.xz
Documentation: spell 'git cmd' without dash throughout
The documentation was quite inconsistent when spelling 'git cmd' if it only refers to the program, not to some specific invocation syntax: both 'git-cmd' and 'git cmd' spellings exist. The current trend goes towards dashless forms, and there is precedent in 647ac70 (git-svn.txt: stop using dash-form of commands., 2009-07-07) to actively eliminate the dashed variants. Replace 'git-cmd' with 'git cmd' throughout, except where git-shell, git-cvsserver, git-upload-pack, git-receive-pack, and git-upload-archive are concerned, because those really live in the $PATH.
Diffstat (limited to 'Documentation/gitcvs-migration.txt')
-rw-r--r--Documentation/gitcvs-migration.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/gitcvs-migration.txt b/Documentation/gitcvs-migration.txt
index 0e49c1c03..d861ec452 100644
--- a/Documentation/gitcvs-migration.txt
+++ b/Documentation/gitcvs-migration.txt
@@ -47,25 +47,25 @@ 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.
================================
You can update the shared repository with your changes by first committing
-your changes, and then using the 'git-push' command:
+your changes, and then using the 'git push' command:
------------------------------------------------
$ 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: