Fix white space

[lilypond.git] / Documentation / contributor / source-code.itexi

diff --git a/Documentation/contributor/source-code.itexi b/Documentation/contributor/source-code.itexi
index c952506ccc0b76011c2b0f7af252345d8a4ec2c9..ba1875c0d670392e71c52b1269a6eedc5f3b3e0b 100644 (file)
--- a/Documentation/contributor/source-code.itexi
+++ b/Documentation/contributor/source-code.itexi
@@ -1029,6 +1029,9 @@ issue webpage and using @qq{Publish + Mail Comments} to add a
 (mostly bogus) comment to your issue.  The text of your comment
 will be sent to our developer mailing list.
 
 (mostly bogus) comment to your issue.  The text of your comment
 will be sent to our developer mailing list.
 

+@warning{There is no automatic notification of a new patch; you
+must add a comment yourself.}
+

 @subsubheading Revisions
 
 As revisions are made in response to comments, successive patch sets
 @subsubheading Revisions
 
 As revisions are made in response to comments, successive patch sets


@@ -1083,6 +1086,7 @@ several Git branches of LilyPond source code is presented.
 * Git log::
 * Applying remote patches::
 * Sending and receiving patches via email::
 * Git log::
 * Applying remote patches::
 * Sending and receiving patches via email::

+* Cleaning up multiple patches::

 * Commit access::
 @end menu
 
 * Commit access::
 @end menu
 


@@ -1190,8 +1194,8 @@ any changes you have made!
 
 Sometimes git will become hopelessly confused, and you just want
 to get back to a known, stable state.  This command destroys any
 
 Sometimes git will become hopelessly confused, and you just want
 to get back to a known, stable state.  This command destroys any

-local changes you have made, but at least you get back to the
-current online version:
+local changes you have made in the currently checked-out branch,
+but at least you get back to the current online version:

 
 @example
 git reset --hard origin/master
 
 @example
 git reset --hard origin/master


@@ -1350,6 +1354,23 @@ provided on the Wine wiki at
 @uref{http://wiki.winehq.org/GitWine}.
 
 
 @uref{http://wiki.winehq.org/GitWine}.
 
 

+@node Cleaning up multiple patches
+@subsection Cleaning up multiple patches
+
+If you have been developing on your own branch for a while, you
+may have more commmits than is really sensible.  To revise your
+work and condense commits, use:
+
+@example
+git rebase origin/master
+git rebase -i origin/master
+@end example
+
+@warning{Be a bit cautious -- if you completely remove commits
+during the interactive session, you will... err... completely
+remove those commits.}
+
+

 @node Commit access
 @subsection Commit access
 
 @node Commit access
 @subsection Commit access
 


@@ -1375,6 +1396,9 @@ you visit the link, follow the steps for including the CAcert root
 certificate in your browser, given at
 @uref{http://savannah.gnu.org/tls/tutorial/}.
 
 certificate in your browser, given at
 @uref{http://savannah.gnu.org/tls/tutorial/}.
 

+@warning{Savannah will silently put your username in lower-case --
+do not try to use capital letters.}
+

 
 @item
 After registering, if you are not logged in automatically, login
 
 @item
 After registering, if you are not logged in automatically, login