From 94c6e24da1cd28abc81ac7ed337de9ed3bb39201 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 13 May 2018 19:39:09 +0100 Subject: Fill in the Pushing section --- README.org | 8 ++++++++ 1 file changed, 8 insertions(+) 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 -- cgit v1.2.3