From 33b86ade66a50bd1e6c1e717034d9f133859b235 Mon Sep 17 00:00:00 2001
From: stasm <stas@mozilla.com>
Date: Fri, 29 Apr 2011 09:34:46 -0700
Subject: [PATCH] Updated Home (markdown)

---
 Home.md | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/Home.md b/Home.md
index 1f1d42a..98942f4 100644
--- a/Home.md
+++ b/Home.md
@@ -1,11 +1,18 @@
 Stas says this is good practice to get patches reviewed in bugzilla and then the comments addressed and the commit message fixed:
 
 ```bash
+git flow feature start 600000-new-feature
+# ...write code...
 git commit
 git show HEAD > patch.diff
-# get review
-git commit more
-# when ready
-git flow feature rebase -i <name>
-git flow feature finish <name>
+# ...attach the patch on bugzilla and get review...
+# ...address reviewer's comments
+git commit 
+git show HEAD > patch.diff
+# ...once you get r+, you're ready to merge onto develop...
+git flow feature rebase -i 600000-new-feature
+# ...leave the first commit as 'pick'...
+# ...and 'squash' all other commits...
+# ...you're done!
+git flow feature finish 600000-new-feature
 ```
\ No newline at end of file