aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2018-05-13 19:39:09 +0100
committerChristopher Baines <mail@cbaines.net>2018-05-13 21:09:53 +0100
commit94c6e24da1cd28abc81ac7ed337de9ed3bb39201 (patch)
tree24f60074aa3893c98c495a73012ce9f2ce9b9a2d
parent7c862fd15a66dd3818c3e5b28c248a9de21f3068 (diff)
downloadmagit-tutorial-94c6e24da1cd28abc81ac7ed337de9ed3bb39201.tar
magit-tutorial-94c6e24da1cd28abc81ac7ed337de9ed3bb39201.tar.gz
Fill in the Pushing section
-rw-r--r--README.org8
1 files changed, 8 insertions, 0 deletions
diff --git a/README.org b/README.org
index 1c2b4a0..ed94db7 100644
--- a/README.org
+++ b/README.org
@@ -199,6 +199,14 @@ to get the repository ready for [[*Pulling][Pulling]].
* Pulling
+At this point, the local =test-branch= should be one commit behind the
+remote =test-branch=. Pulling will fetch and merge that commit in to
+the local branch.
+
+Press =F=, the =u= to pull from the upstream branch ([[*Setting the upstream branch][as defined
+previously]]). Like pushing, the are a few options for pulling, but for
+now this is the only one needed.
+
* Interactive rebasing
* Splitting commits