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

Document merge base and GitAnnotated #23437

Merged
merged 1 commit into from
Aug 25, 2017
Merged

Document merge base and GitAnnotated #23437

merged 1 commit into from
Aug 25, 2017

Conversation

kshyatt
Copy link
Contributor

@kshyatt kshyatt commented Aug 24, 2017

No description provided.

@kshyatt kshyatt added docs This change adds or pertains to documentation libgit2 The libgit2 library or the LibGit2 stdlib module labels Aug 24, 2017
@kshyatt kshyatt requested a review from ararslan August 24, 2017 22:28
the commit. Conflict files contain information about the source/target branches in
the merge which are conflicting, for instance. An annotated commit can refer to the
tip of a remote branch, for instance when a [`FetchHead`](@ref) is passed, or to a
branch head described using `GitReference`.
Copy link
Member

Choose a reason for hiding this comment

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

I really like this description! It would be good to mention what the GitAnnotated constructor does or returns though. It gives you a GitAnnotated, which is an annotated commit object, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes. I'm glad the description is useful. It seemed clear to me that these are c-tors but maybe not...

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, I guess it's fine as-is.

@kshyatt kshyatt merged commit 149d108 into master Aug 25, 2017
@kshyatt kshyatt deleted the ksh/docmerge2 branch August 25, 2017 19:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs This change adds or pertains to documentation libgit2 The libgit2 library or the LibGit2 stdlib module
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants