This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git
The following commit(s) were added to refs/heads/master by this push:
new d8db066 Make git instructions slightly shorter (#220)
d8db066 is described below
commit d8db06675c0d03c9e999a7ada5a02930c496d86c
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Tue Feb 11 11:50:40 2020 -0500
Make git instructions slightly shorter (#220)
Shorten git instructions by one step for pushing the asf-staging branch
to the asf-site branch for publishing.
---
README.md | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 190655f..8a4c2d6 100644
--- a/README.md
+++ b/README.md
@@ -139,12 +139,9 @@ git checkout master
# Step 1: update your upstream remote
git remote update upstream
-# Step 2: create/update your local asf-site branch from the upstream staging
branch
-git branch --track --force asf-site upstream/asf-staging
-
-# Step 3: push it
+# Step 2: push upstream/asf-staging to upstream/asf-site
# run next command with --dry-run first to see what it will do without making
changes
-git push upstream asf-site:asf-site
+git push upstream upstream/asf-staging:asf-site
```
Note that Step 3 should always be a fast-forward merge. That is, there should
