From: Graham Percival <graham@percival-music.ca>
Date: Thu, 9 Jul 2009 23:42:55 +0000 (-0700)
Subject: Doc: CG: add the magic command to solve all conflicts.
X-Git-Tag: release/2.13.4-1~365
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=27093ad1e9fb871ba4831cd1ac6099797daba7c7;p=lilypond.git

Doc: CG: add the magic command to solve all conflicts.
---

diff --git a/Documentation/devel/git-starting.itexi b/Documentation/devel/git-starting.itexi
index ed9f6b70df..6d6d55e86c 100644
--- a/Documentation/devel/git-starting.itexi
+++ b/Documentation/devel/git-starting.itexi
@@ -314,6 +314,7 @@ Git branches of LilyPond source code is presented.
 * Working on LilyPond sources with several branches::  
 * Git log::                     
 * Applying git patches::        
+* Reverting all local changes::  
 @end menu
 
 
@@ -572,6 +573,19 @@ git commit -a --author="First Last <user@@example.net>"
 @end example
 
 
+@node Reverting all local changes
+@subsection Reverting all local changes
+
+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:
+
+@example
+git reset --hard origin/master
+@end example
+
+
 @node Git on Windows
 @section Git on Windows