mahout-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlyubi...@apache.org
Subject svn commit: r1598096 - /mahout/site/mahout_cms/trunk/content/developers/github.mdtext
Date Wed, 28 May 2014 18:11:51 GMT
Author: dlyubimov
Date: Wed May 28 18:11:50 2014
New Revision: 1598096

URL: http://svn.apache.org/r1598096
Log:
adding explicit repository specification on closing message

Modified:
    mahout/site/mahout_cms/trunk/content/developers/github.mdtext

Modified: mahout/site/mahout_cms/trunk/content/developers/github.mdtext
URL: http://svn.apache.org/viewvc/mahout/site/mahout_cms/trunk/content/developers/github.mdtext?rev=1598096&r1=1598095&r2=1598096&view=diff
==============================================================================
--- mahout/site/mahout_cms/trunk/content/developers/github.mdtext (original)
+++ mahout/site/mahout_cms/trunk/content/developers/github.mdtext Wed May 28 18:11:50 2014
@@ -35,7 +35,7 @@ Start with reading \[[2]\] (merging loca
 
 Remember that pull requests are equivalent to a remote github branch with potentially a multitude
of commits. 
 In this case it is recommended to squash remote commit history to have one commit per issue,
rather 
-than merging in a multitude of contributer's commits. In order to do that, as well as close
the PR at the 
+than merging in a multitude of contributor's commits. In order to do that, as well as close
the PR at the 
 same time, it is recommended to use **squash commits**.
 
 Merging pull requests are equivalent to merging contributor's branch:
@@ -62,10 +62,10 @@ Also run regular patch checks and change
 
 Suppose everything is fine, you now can commit the squashed request along the lines
 
-    git commit -a -m "MAHOUT-YYYY description (cuser via ssc) **closes #ZZ**"
+    git commit -a -m "MAHOUT-YYYY description (cuser via ssc) closes apache/mahout#ZZ"
 
-where `ZZ` is the pull request number. Including "closes #ZZ" will close PR automatically.

-More information here \[[3]\].
+where `ZZ` is the pull request number on apache/mahout repository. Including "closes #ZZ"
will close PR 
+automatically. More information is found here \[[3]\].
 
 Next, push to git-wip-us.a.o:
 
@@ -86,7 +86,7 @@ would warn to begin with. Anyway, watch 
 When we want to reject a PR (close without committing), we can just issue an empty commit
on master's HEAD 
 *without merging the PR*: 
 
-    git commit --allow-empty -m "closes #ZZ *Won't fix*"
+    git commit --allow-empty -m "closes apache/mahout#ZZ *Won't fix*"
     git push apache master
 
 that should close PR `ZZ` on github mirror without merging and any code modifications in
the master repository.



Mime
View raw message