summaryrefslogtreecommitdiff
path: root/wiki/git
diff options
context:
space:
mode:
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.