From e4d376db088d296dfb34b58e8b557c38107b17c8 Mon Sep 17 00:00:00 2001
From: Kyle Kaminski <kyle@kkaminsk.com>
Date: Wed, 21 May 2014 22:27:43 -0500
Subject: initial commit

---
 git-branching-model.txt | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 git-branching-model.txt

(limited to 'git-branching-model.txt')

diff --git a/git-branching-model.txt b/git-branching-model.txt
new file mode 100644
index 0000000..2dfe7b5
--- /dev/null
+++ b/git-branching-model.txt
@@ -0,0 +1,4 @@
+- when merging use --no-ff (no fast forward)
+- you can think of xstage as master, whatever you merge to master you will merge
+  to xstage, so double the work, but this way we have xstage exclusively for
+  testing
-- 
cgit v1.2.3