summaryrefslogtreecommitdiff
path: root/wiki
diff options
context:
space:
mode:
authorOwen Jacobson <owen.jacobson@grimoire.ca>2013-06-28 15:09:03 -0400
committerOwen Jacobson <owen.jacobson@grimoire.ca>2013-06-28 15:09:03 -0400
commit8f0341d0a44f5cd4fc97c9f898f5ee0af916dc75 (patch)
tree01803baa2e70edf2a11a8afdfa34b4ab8dabbc97 /wiki
parent730dcf5e7ab2190e0c67aa98bbdd19cee6319728 (diff)
More prose on pull requests.
Diffstat (limited to 'wiki')
-rw-r--r--wiki/git/pull-request-workflow.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/wiki/git/pull-request-workflow.md b/wiki/git/pull-request-workflow.md
index 900c45b..2d7e216 100644
--- a/wiki/git/pull-request-workflow.md
+++ b/wiki/git/pull-request-workflow.md
@@ -49,6 +49,9 @@ While you're here, `cd` into it and add the original project as a remote:
## Feature process
+Do these things for each feature you work on. To switch features, just use
+`git checkout my-feature`.
+
### Create a new feature branch locally
We use `upstream`'s `master` branch here, so that your feature includes all of