Doc-de: update macros.itely and nitpicks

[lilypond.git] / Documentation / devel / git-starting.itexi

diff --git a/Documentation/devel/git-starting.itexi b/Documentation/devel/git-starting.itexi
index 1fb162042f119cfcfcc98f11cd8e78ea4bacd75c..c50ba18da478da12cae1897b78e84198b30fda0e 100644 (file)
--- a/Documentation/devel/git-starting.itexi
+++ b/Documentation/devel/git-starting.itexi
@@ -171,7 +171,7 @@ local copy of the repository with the changes made by others on
 the remote @code{git.sv.gnu.org} repository:
 
 @example
-git pull origin
+git pull -r
 @end example
 
 
@@ -214,10 +214,18 @@ git format-patch origin
 The commit should include a brief message describing the change.
 This consists of a one-line summary describing the change, and
 if necessary a blank line followed by several lines giving the
-details.
+details:
+
+@example
+Did household chores.
 
-If the change is to the documentation only the one-line summary
-should be prefixed with "Docs: ".
+I hung up the wet laundry and then washed the car.  I also
+vacuumed the floors, rinsed the dirty dishes, fed the cat, and
+recalibrated the temporal flux machine.
+@end example
+
+If the change is to the documentation only then the one-line
+summary should be prefixed with @qq{Docs: }.
 
 If you added a file to the source code, you must add it to git
 with:
@@ -232,7 +240,8 @@ git add FILENAME
 These commands will produce one or more files named
 @file{0001-xyz}, @file{0002-abc}, etc. in the top directory of the
 git tree.  Send an email to @email{lilypond-devel@@gnu.org} with
-these files attached.
+these files attached, and a developer will review and apply the
+patches to the main repository.
 
 
 @node Committing directly
@@ -570,9 +579,14 @@ just the differences from master).
 @subsection Installing git
 
 Obtain Git from
-@uref{http://code.google.com/p/msysgit/downloads/list}.
-(Note, not msysGit, which is for Git developers) and
-install.
+@uref{http://code.google.com/p/msysgit/downloads/list}
+(note, not msysGit, which is for Git developers and not PortableGit,
+which is not a full git installation) and
+install it.
+
+Note that most users will not need to install SSH.  That is not
+required until you have been granted direct push permissions to
+the master git repository.
 
 Start Git by clicking on the desktop icon.
 This will bring up a command line bash shell.  This may be
@@ -587,7 +601,8 @@ creating the folders in Windows as necessary.  Here we
 call the folder to contain the repository [path]/Git.
 You will need to have space for around 150Mbytes.
 
-In the git bash shell type
+Start the Git bash shell by clicking on the desk-top icon installed
+with Git and type
 
 @example
 cd [path]/Git
@@ -688,6 +703,15 @@ and enter your name and email address in the
 left-hand (Git Repository) panel.  Leave everything
 else unchanged and save it.
 
+Note that Windows users must leave the default setting for line
+endings unchanged.  All files in a git repository must have lines
+terminated by just a LF, as this is required for Merge to work, but
+Windows files are terminated by CRLF by default.  The git default
+setting causes the line endings of files in a Windows git repository
+to be flipped automatically between LF and CRLF as required.  This
+enables files to be edited by any Windows editor without causing
+problems in the git repository.
+
 @subsection Checking out a branch
 
 At this stage you have two branches in your local repository,