From 8af2b2555fbb4fe83e48c400d583b420cb27c26b Mon Sep 17 00:00:00 2001 From: Stephen Haberman Date: Wed, 12 Nov 2008 22:09:31 -0600 Subject: [PATCH] I guess non-READMEs don't need the master part. --- workflow.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow.markdown b/workflow.markdown index 4668562..fe94960 100644 --- a/workflow.markdown +++ b/workflow.markdown @@ -45,8 +45,8 @@ When candidate_1.1 is released, we checkout stable, `git merge --no-ff candidate Note that the [update-stable][1] hook enforces this first-parent movement of stable and the [update-ensure-follows][2] enforces topic branches merge in the new release at their earliest possible convenience (i.e. before being able to push again). -[1]: master/server/update-stable -[2]: master/server/update-ensure-follows +[1]: server/update-stable +[2]: server/update-ensure-follows candidates ========== @@ -73,5 +73,5 @@ Rebasing: * Is great for local commits to avoid same-branch merges (where a dev has a local, unshared commit and then creates a useless merge of it into the same branch that has since moved on) * Is a PITA unless you use the [pull][3] scripts -[3]: master/scripts/pull +[3]: scripts/pull -- 2.39.5