diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-06-04 00:01:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-04 00:01:52 -0700 |
| commit | f63237a18e951b93ac46a0e594f286255e1eaaaf (patch) | |
| tree | a131e9466bc5ca7ca42e31e71274ce3152dc8615 /Documentation/cvs-migration.txt | |
| parent | Merge branch 'jc/fmt-patch' into next (diff) | |
| parent | Cleanup git-send-email.perl:extract_valid_email (diff) | |
| download | tgif-f63237a18e951b93ac46a0e594f286255e1eaaaf.tar.xz | |
Merge branch 'vb/sendemail' into next
* vb/sendemail:
Cleanup git-send-email.perl:extract_valid_email
read-tree --reset: update working tree file for conflicted paths.
Documentation: Spelling fixes
Builtin git-rev-parse.
fetch: do not report "same" unless -verbose.
Diffstat (limited to 'Documentation/cvs-migration.txt')
| -rw-r--r-- | Documentation/cvs-migration.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/cvs-migration.txt b/Documentation/cvs-migration.txt index fa94efde8d..826d0897e2 100644 --- a/Documentation/cvs-migration.txt +++ b/Documentation/cvs-migration.txt @@ -1,7 +1,7 @@ git for CVS users ================= -So you're a CVS user. That's ok, it's a treatable condition. The job of +So you're a CVS user. That's OK, it's a treatable condition. The job of this document is to put you on the road to recovery, by helping you convert an existing cvs repository to git, and by showing you how to use a git repository in a cvs-like fashion. @@ -159,7 +159,7 @@ other than `master`. [NOTE] ============ -Because of this behaviour, if the shared repository and the developer's +Because of this behavior, if the shared repository and the developer's repository both have branches named `origin`, then a push like the above attempts to update the `origin` branch in the shared repository from the developer's `origin` branch. The results may be unexpected, so it's |