mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint' to sync with GIT 1.6.0.6

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2008-12-19 19:32:29 -08:00
parent ec9f0ea3e6 718258e256
commit efe05b019c
26 changed files with 185 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/gitcore-tutorial.txt
View File

@ -999,8 +999,8 @@ Fast forward (no commit created; -m option ignored)
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.
@ -1352,7 +1352,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`.
@ -1511,7 +1511,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.