Skip to content

Provide missing merge flags #615

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

Merged
merged 2 commits into from
Jun 5, 2020
Merged

Conversation

takuji
Copy link
Contributor

@takuji takuji commented Jun 4, 2020

This change adds two missing merge flags MergeTreeSkipREUC and MergeTreeNoRecursive.
Thanks.

Copy link
Contributor

@lhchavez lhchavez left a comment

Choose a reason for hiding this comment

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

nice! just one tiny request

Copy link
Contributor

@lhchavez lhchavez left a comment

Choose a reason for hiding this comment

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

Thank you :D

@lhchavez lhchavez merged commit 33dac3d into libgit2:master Jun 5, 2020
lhchavez pushed a commit that referenced this pull request Aug 15, 2020
This change adds two missing merge flags MergeTreeSkipREUC and MergeTreeNoRecursive.

(cherry picked from commit 33dac3d)
lhchavez pushed a commit that referenced this pull request Aug 15, 2020
This change adds two missing merge flags MergeTreeSkipREUC and MergeTreeNoRecursive.

(cherry picked from commit 33dac3d)
lhchavez pushed a commit that referenced this pull request Aug 15, 2020
This change adds two missing merge flags MergeTreeSkipREUC and MergeTreeNoRecursive.

(cherry picked from commit 33dac3d)
lhchavez pushed a commit that referenced this pull request Aug 15, 2020
This change adds two missing merge flags MergeTreeSkipREUC and MergeTreeNoRecursive.

(cherry picked from commit 33dac3d)
lhchavez pushed a commit that referenced this pull request Aug 16, 2020
This change adds two missing merge flags MergeTreeSkipREUC and MergeTreeNoRecursive.

(cherry picked from commit 33dac3d)
lhchavez pushed a commit that referenced this pull request Aug 16, 2020
This change adds two missing merge flags MergeTreeSkipREUC and MergeTreeNoRecursive.

(cherry picked from commit 33dac3d)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants