Rebase InSpec

gistfile1.txt

➜  inspec git:(oracle-linux-service-resource) ✗ git checkout master
Switched to branch 'master'
➜  inspec git:(master) git remote add inspec https://github.com/chef/inspec.git
➜  inspec git:(master) ✗ git pull inspec master
From https://github.com/chef/inspec
 * branch            master     -> FETCH_HEAD
 * [new branch]      master     -> inspec/master
Already up-to-date.
➜  inspec git:(master) ✗ git checkout oracle-linux-service-resource
Switched to branch 'oracle-linux-service-resource'
Your branch is up-to-date with 'carldjohnston/oracle-linux-service-resource'.
➜  inspec git:(oracle-linux-service-resource) ✗ git rebase master
First, rewinding head to replay your work on top of it...
Applying: Added oracle linux to rhel platform section.
Applying: Split rhel / fedora to support more redhat systems (via chef/train)
Applying: Revert "Split rhel / fedora to support more redhat systems (via chef/train)"
➜  inspec git:(oracle-linux-service-resource) ✗ git push origin oracle-linux-service-resource -f