Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Documentation copy edit pt 2 #6665

Merged
merged 5 commits into from
Sep 25, 2020
Merged

Documentation copy edit pt 2 #6665

merged 5 commits into from
Sep 25, 2020

Conversation

mike-myers-tob
Copy link
Member

Another documentation PR of manageable size, a follow-on to #6662

@mike-myers-tob
Copy link
Member Author

mike-myers-tob commented Sep 23, 2020 •
edited

Maybe I need to rebase on master to fix the git history, can @theopolis advise? I wanted to just have the last 5 commits in this PR.

Yea, fixed the git history. Thank you @Smjert — what I had done wrong before is that I had hesitated to use push --force after a rebase, instead thinking I had to pull from the remote again in order to resolve "your current branch is behind" warnings (must not do that).

@theopolis theopolis merged commit 8a790ed into osquery:master Sep 25, 2020
@mike-myers-tob mike-myers-tob deleted the documentation-copy-edit-pt-2 branch September 26, 2020 03:30
@mike-myers-tob mike-myers-tob mentioned this pull request Sep 26, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@theopolis theopolis theopolis approved these changes

@directionless directionless Awaiting requested review from directionless

Assignees
No one assigned
Labels
documentation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@mike-myers-tob @theopolis