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.

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

Update dolt merge docs #1068

Merged
merged 3 commits into from Dec 6, 2022
Merged

Update dolt merge docs #1068

merged 3 commits into from Dec 6, 2022

Conversation

theetrain
Copy link
Contributor

@theetrain theetrain commented Dec 6, 2022 •
edited

  • Provide consistent usage explanation for --author in dolt merge and DOLT_MERGE()
  • Fix typo in --no-ff usage for DOLT_MERGE()

theetrain and others added 3 commits December 5, 2022 20:57
@theetrain
docs: update cli
51cdb5a 
Adjust --author example for dolt merge
@theetrain
docs: update sql procedures
3ab9608 
Update --author example for dolt_merge()
@theetrain
docs: update sql procedures
53c9db1 
Forgotten hyphen in `--no-ff`
fulghum
fulghum approved these changes Dec 6, 2022
View reviewed changes
Copy link
Contributor

@fulghum fulghum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for helping us improve the Dolt documentation @theetrain! Very cool to see this contribution. 🙏

Changes look great! We'll get these updated on the site shortly.

@fulghum fulghum merged commit ae01018 into dolthub:gitbook-dev Dec 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fulghum fulghum fulghum approved these changes

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

Successfully merging this pull request may close these issues.

None yet
2 participants
@theetrain @fulghum