Skip to content

Commit

Permalink
Squash all method for cloning
Browse files Browse the repository at this point in the history
Squash all method for merging updates not yet implemented
  • Loading branch information
dhimmel committed Sep 1, 2017
1 parent 26472cd commit de4b67f
Showing 1 changed file with 23 additions and 3 deletions.
26 changes: 23 additions & 3 deletions SETUP.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,31 @@ Next you must clone `greenelab/manubot-rootstock` and configure its branches and
git clone https://github.com/greenelab/manubot-rootstock.git $REPO
cd $REPO

# Squash all manubot-rootstock commits
git reset $(\
GIT_AUTHOR_NAME="Manubot Rootstock Contributors" \
GIT_AUTHOR_EMAIL="" \
git commit-tree HEAD^{tree} \
-m "Squash all manubot rootstock commits" \
-m "From https://github.com/greenelab/manubot-rootstock/tree/`git rev-parse HEAD`" \
)

# Create remote gh-pages branch
git checkout --orphan gh-pages
git rm -r --cached .
git commit --allow-empty \
--message "Blank branch instantiation commit" \
--message "[ci skip]"

# Create remote output branch
git branch output
git checkout output

# Return to the master branch
git checkout --force master

# Configure remotes and branches
git remote add rootstock https://github.com/greenelab/manubot-rootstock.git
git checkout gh-pages
git checkout output
git checkout master

# Option A: Set origin URL using its web address
git remote set-url origin https://github.com/$OWNER/$REPO.git
Expand Down

0 comments on commit de4b67f

Please sign in to comment.