summaryrefslogtreecommitdiff
path: root/wiki/git
diff options
context:
space:
mode:
authorOwen Jacobson <owen.jacobson@grimoire.ca>2013-06-28 15:04:59 -0400
committerOwen Jacobson <owen.jacobson@grimoire.ca>2013-06-28 15:04:59 -0400
commit730dcf5e7ab2190e0c67aa98bbdd19cee6319728 (patch)
treeb717f9cd13dbeed5750e853bcda63b77cc28d615 /wiki/git
parent5a6d2838ed7c040e07f987b75cc62fadca0925e1 (diff)
Fix up styling on definition lists.
Also a minor list-structure issue in Pull requests.
Diffstat (limited to 'wiki/git')
-rw-r--r--wiki/git/pull-request-workflow.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/wiki/git/pull-request-workflow.md b/wiki/git/pull-request-workflow.md
index ca6cae2..900c45b 100644
--- a/wiki/git/pull-request-workflow.md
+++ b/wiki/git/pull-request-workflow.md
@@ -9,6 +9,7 @@ I use a couple of naming conventions here that are not stock `git`:
origin
: The repository to which you _publish_ proposed changes
+
upstream
: The repository from which you receive ongoing development, and which will
receive your changes.