svn commit: r1519563 - /isis/site/trunk/content/contributors/applying-patches.md

[da...@apache.org]

Author: danhaywood
Date: Tue Sep  3 05:35:41 2013
New Revision: 1519563

URL: http://svn.apache.org/r1519563
Log:
improved instructions for how to apply patches

Modified:
    isis/site/trunk/content/contributors/applying-patches.md

Modified: isis/site/trunk/content/contributors/applying-patches.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/contributors/applying-patches.md?rev=1519563&r1=1519562&r2=1519563&view=diff
==============================================================================
--- isis/site/trunk/content/contributors/applying-patches.md (original)
+++ isis/site/trunk/content/contributors/applying-patches.md Tue Sep  3 05:35:41 2013
@@ -25,7 +25,7 @@ Next, you’re interested in how trou
 
     git apply --check ISIS-xxx.patch
 
-If you don’t get any errors, the patch can be applied cleanly. Otherwise you may see what trouble you’ll run into.
+If you don’t get any errors, the patch has no conflicts. Otherwise you may see what trouble you’ll run into.
 
 ### Apply a (clean) patch
 
@@ -35,6 +35,12 @@ To apply a clean patch (adding the items
 
 This preserves the original author's commit message.
 
+However, this can fail if the patch file does not contain the original committers email address.  In this case you will need to abort the `am` session:
+
+    git am abort
+
+and continue on by applying a non-clean patch, as described next.
+
 ### Apply a (non-clean) patch
 
 If the patch does not apply cleanly, then the original authors commit message cannot be preserved.  This sequence in this case is:
@@ -44,7 +50,7 @@ If the patch does not apply cleanly, the
 Fix up any issues.  The add and commit as usual
 
     git add .
-    git commit am "<original authors' commit message>" --signoff
+    git commit -am "<original authors' commit message>" --signoff
 
 The `--signoff` simply adds a line to the commit message indicating you have signed off the commit.