From: Stephen Haberman <stephen@exigencecorp.com>
Date: Thu, 13 Nov 2008 04:08:08 +0000 (-0600)
Subject: Not very good, but rebase vs. merge.
X-Git-Url: http://git.droids-corp.org/?p=git-central.git;a=commitdiff_plain;h=061820e0dd87848124133f053b2386b378272604

Not very good, but rebase vs. merge.
---

diff --git a/workflow.markdown b/workflow.markdown
index 7a7c074..4668562 100644
--- a/workflow.markdown
+++ b/workflow.markdown
@@ -60,3 +60,18 @@ topics
 
 Topics are fairly obvious.
 
+rebase vs. merge
+================
+
+Merging:
+
+* Is great for cross-branch scenarios--merging candidates into stable, stable into topics, etc.
+* 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
+
+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
+