diff options
author | Markus Heidelberg <markus.heidelberg@web.de> | 2008-12-19 13:14:18 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-12-19 19:10:46 -0800 |
commit | 04c8ce9c1c803a8dc0f3728f57550f9bc9e605c2 (patch) | |
tree | f2756934c58c5f1e0e94709009847894af512b9c /Documentation/gitcore-tutorial.txt | |
parent | 87c8a56e4f71cc7e22c16caa4adc2ae17f6aa93d (diff) | |
download | git-04c8ce9c1c803a8dc0f3728f57550f9bc9e605c2.tar.gz git-04c8ce9c1c803a8dc0f3728f57550f9bc9e605c2.tar.xz |
Documentation: fix typos, grammar, asciidoc syntax
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitcore-tutorial.txt')
-rw-r--r-- | Documentation/gitcore-tutorial.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt index 61fc5d7be..896cbdf68 100644 --- a/Documentation/gitcore-tutorial.txt +++ b/Documentation/gitcore-tutorial.txt @@ -999,8 +999,8 @@ Fast forward 2 files changed, 2 insertions(+), 0 deletions(-) ---------------- -Because your branch did not contain anything more than what are -already merged into the `master` branch, the merge operation did +Because your branch did not contain anything more than what had +already been merged into the `master` branch, the merge operation did not actually do a merge. Instead, it just updated the top of the tree of your branch to that of the `master` branch. This is often called 'fast forward' merge. @@ -1353,7 +1353,7 @@ $ GIT_DIR=my-git.git git init ------------ Make sure this directory is available for others you want your -changes to be pulled by via the transport of your choice. Also +changes to be pulled via the transport of your choice. Also you need to make sure that you have the 'git-receive-pack' program on the `$PATH`. @@ -1512,7 +1512,7 @@ You can repack this private repository whenever you feel like. 6. Push your changes to the public repository, and announce it to the public. -7. Every once in a while, "git-repack" the public repository. +7. Every once in a while, 'git-repack' the public repository. Go back to step 5. and continue working. |