From: Karen Etheridge Date: Fri, 30 Jul 2010 20:54:23 +0000 (-0700) Subject: explicitly specify origin/master as the start point for a new topic branch; as a... X-Git-Tag: 1.10~19 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=82093ebb3adfcb0f9d25427dd957bd4e3c5ccc9b;p=gitmo%2FMoose.git explicitly specify origin/master as the start point for a new topic branch; as a git n00b I was leaving this off, which made future rebases/merges harder (and experienced git users will know whether they want to use a different branch as a start point). --- diff --git a/lib/Moose/Manual/Contributing.pod b/lib/Moose/Manual/Contributing.pod index 73ae264..c57b8ef 100644 --- a/lib/Moose/Manual/Contributing.pod +++ b/lib/Moose/Manual/Contributing.pod @@ -120,7 +120,7 @@ Any change or bugfix should be created in a topic branch. git pull --rebase # create a new topic branch - git checkout -b topic/my-feature + git checkout -b topic/my-feature origin/master # hack, commit, feel free to break fast forward git commit --amend # allowed