diff options
| author | Kyle Kaminski <kyle@kkaminsk.com> | 2014-05-21 22:27:43 -0500 |
|---|---|---|
| committer | Kyle Kaminski <kyle@kkaminsk.com> | 2014-05-21 22:27:43 -0500 |
| commit | e4d376db088d296dfb34b58e8b557c38107b17c8 (patch) | |
| tree | 236b99505e9ae69e287f07e0331fad3bb5fe33af /git-branching-model.txt | |
| download | drupal-quest-e4d376db088d296dfb34b58e8b557c38107b17c8.tar.gz drupal-quest-e4d376db088d296dfb34b58e8b557c38107b17c8.tar.bz2 drupal-quest-e4d376db088d296dfb34b58e8b557c38107b17c8.zip | |
initial commit
Diffstat (limited to 'git-branching-model.txt')
| -rw-r--r-- | git-branching-model.txt | 4 |
1 files changed, 4 insertions, 0 deletions
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 |