Fix readme links.

[git-central.git] / workflow.markdown

diff --git a/workflow.markdown b/workflow.markdown
index 7a7c074..fe94960 100644 (file)
--- a/workflow.markdown
+++ b/workflow.markdown
@@ -45,8 +45,8 @@ When candidate_1.1 is released, we checkout stable, `git merge --no-ff candidate
 \r
 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).\r
 \r
-[1]: master/server/update-stable\r
-[2]: master/server/update-ensure-follows\r
+[1]: server/update-stable\r
+[2]: server/update-ensure-follows\r
 \r
 candidates\r
 ==========\r
@@ -60,3 +60,18 @@ topics
 \r
 Topics are fairly obvious.\r
 \r
+rebase vs. merge\r
+================\r
+\r
+Merging:\r
+\r
+* Is great for cross-branch scenarios--merging candidates into stable, stable into topics, etc.\r
+* In cross-branch scenarios, fast-forwarding generally isn't preferred as seeing a no-op merge commit into stable or into a new candidate is still useful for DAG aesthetics\r
+\r
+Rebasing:\r
+\r
+* 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)\r
+* Is a PITA unless you use the [pull][3] scripts\r
+\r
+[3]: scripts/pull\r
+\r