You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by mm...@apache.org on 2014/05/16 21:43:18 UTC

git commit: Change instruction to default to master branch

Repository: cordova-coho
Updated Branches:
  refs/heads/master b5dec0eef -> 4e1580457


Change instruction to default to master branch

We no longer use dev branch for plugins, so may as well have the docs
default to the right branch.


Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/4e158045
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/4e158045
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/4e158045

Branch: refs/heads/master
Commit: 4e1580457f4ea290ca6bedf29088b9c00b0009c1
Parents: b5dec0e
Author: Michal Mocny <mm...@gmail.com>
Authored: Fri May 16 15:42:27 2014 -0400
Committer: Michal Mocny <mm...@gmail.com>
Committed: Fri May 16 15:42:27 2014 -0400

----------------------------------------------------------------------
 docs/processing-pull-requests.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/4e158045/docs/processing-pull-requests.md
----------------------------------------------------------------------
diff --git a/docs/processing-pull-requests.md b/docs/processing-pull-requests.md
index 5d998ce..3bf005d 100644
--- a/docs/processing-pull-requests.md
+++ b/docs/processing-pull-requests.md
@@ -37,7 +37,7 @@ Run the following as an exemplary way to merge to master:
 
     # Pro Tip: coho list-pulls will generate the following commands for copy&paste
     git pull https://github.com/GitHubUser/cordova-FOO BRANCH
-    git rebase origin/MASTER_OR_DEV -i
+    git rebase origin/master -i
 
 The rebase step will let you interactively review the changes being made to master. You should: