From: Junio C Hamano Date: Wed, 15 Feb 2017 20:54:20 +0000 (-0800) Subject: Merge branch 'sb/doc-unify-bottom' X-Git-Tag: v2.12.0-rc2~15 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/153a33f98c1d68d48d7e030a4cff99ba07791dc2?hp=-c Merge branch 'sb/doc-unify-bottom' Doc clean-up. * sb/doc-unify-bottom: Documentation: unify bottom "part of git suite" lines --- 153a33f98c1d68d48d7e030a4cff99ba07791dc2 diff --combined Documentation/gitcore-tutorial.txt index 22309cfb48,a7d36ea911..3a0ec8c53a --- a/Documentation/gitcore-tutorial.txt +++ b/Documentation/gitcore-tutorial.txt @@@ -25,7 -25,7 +25,7 @@@ you want to understand Git's internals The core Git is often called "plumbing", with the prettier user interfaces on top of it called "porcelain". You may not want to use the plumbing directly very often, but it can be good to know what the -plumbing does for when the porcelain isn't flushing. +plumbing does when the porcelain isn't flushing. Back when this document was originally written, many porcelain commands were shell scripts. For simplicity, it still uses them as @@@ -949,7 -949,7 +949,7 @@@ for details [NOTE] If there were more commits on the 'master' branch after the merge, the merge commit itself would not be shown by 'git show-branch' by -default. You would need to provide '--sparse' option to make the +default. You would need to provide `--sparse` option to make the merge commit visible in this case. Now, let's pretend you are the one who did all the work in @@@ -1368,7 -1368,7 +1368,7 @@@ $ git repac will do it for you. If you followed the tutorial examples, you would have accumulated about 17 objects in `.git/objects/??/` directories by now. 'git repack' tells you how many objects it -packed, and stores the packed file in `.git/objects/pack` +packed, and stores the packed file in the `.git/objects/pack` directory. [NOTE] @@@ -1478,7 -1478,7 +1478,7 @@@ You can repack this private repository A recommended work cycle for a "subsystem maintainer" who works on that project and has an own "public repository" goes like this: -1. Prepare your work repository, by 'git clone' the public +1. Prepare your work repository, by running 'git clone' on the public repository of the "project lead". The URL used for the initial cloning is stored in the remote.origin.url configuration variable. @@@ -1543,9 -1543,9 +1543,9 @@@ like this Working with Others, Shared Repository Style -------------------------------------------- -If you are coming from CVS background, the style of cooperation +If you are coming from a CVS background, the style of cooperation suggested in the previous section may be new to you. You do not -have to worry. Git supports "shared public repository" style of +have to worry. Git supports the "shared public repository" style of cooperation you are probably more familiar with as well. See linkgit:gitcvs-migration[7] for the details. @@@ -1635,7 -1635,7 +1635,7 @@@ $ git show-branc ++* [master~2] Pretty-print messages. ------------ -Note that you should not do Octopus because you can. An octopus +Note that you should not do Octopus just because you can. An octopus is a valid thing to do and often makes it easier to view the commit history if you are merging more than two independent changes at the same time. However, if you have merge conflicts @@@ -1658,4 -1658,4 +1658,4 @@@ link:user-manual.html[The Git User's Ma GIT --- - Part of the linkgit:git[1] suite. + Part of the linkgit:git[1] suite diff --combined Documentation/gitcvs-migration.txt index 4c6143c511,e0754db936..1cd1283d0f --- a/Documentation/gitcvs-migration.txt +++ b/Documentation/gitcvs-migration.txt @@@ -116,12 -116,8 +116,12 @@@ they create are writable and searchabl Importing a CVS archive ----------------------- +NOTE: These instructions use the `git-cvsimport` script which ships with +git, but other importers may provide better results. See the note in +linkgit:git-cvsimport[1] for other options. + First, install version 2.1 or higher of cvsps from -http://www.cobite.com/cvsps/[http://www.cobite.com/cvsps/] and make +https://github.com/andreyvit/cvsps[https://github.com/andreyvit/cvsps] and make sure it is in your path. Then cd to a checked out CVS working directory of the project you are interested in and run linkgit:git-cvsimport[1]: @@@ -203,4 -199,4 +203,4 @@@ link:user-manual.html[The Git User's Ma GIT --- - Part of the linkgit:git[1] suite. + Part of the linkgit:git[1] suite diff --combined Documentation/gitdiffcore.txt index 08cf62278e,147566ac67..46bc6d077c --- a/Documentation/gitdiffcore.txt +++ b/Documentation/gitdiffcore.txt @@@ -28,8 -28,8 +28,8 @@@ The 'git diff-{asterisk}' family works files: - 'git diff-index' compares contents of a "tree" object and the - working directory (when '--cached' flag is not used) or a - "tree" object and the index file (when '--cached' flag is + working directory (when `--cached` flag is not used) or a + "tree" object and the index file (when `--cached` flag is used); - 'git diff-files' compares contents of the index file and the @@@ -288,4 -288,4 +288,4 @@@ link:user-manual.html[The Git User's Ma GIT --- - Part of the linkgit:git[1] suite. + Part of the linkgit:git[1] suite diff --combined Documentation/gitrepository-layout.txt index a5f99cbb11,70cf49613f..f51ed4e37c --- a/Documentation/gitrepository-layout.txt +++ b/Documentation/gitrepository-layout.txt @@@ -177,7 -177,7 +177,7 @@@ sharedindex.: info:: Additional information about the repository is recorded in this directory. This directory is ignored if $GIT_COMMON_DIR - is set and "$GIT_COMMON_DIR/index" will be used instead. + is set and "$GIT_COMMON_DIR/info" will be used instead. info/refs:: This file helps dumb transports discover what refs are @@@ -289,4 -289,4 +289,4 @@@ link:user-manual.html[The Git User's Ma GIT --- - Part of the linkgit:git[1] suite. + Part of the linkgit:git[1] suite