-
Notifications
You must be signed in to change notification settings - Fork 26
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
Update libgit2 to c5cacc4 #76
Merged
Merged
Commits on Apr 14, 2014
-
Configuration menu - View commit details
-
Copy full SHA for dffae9d - Browse repository at this point
Copy the full SHA dffae9dView commit details -
Configuration menu - View commit details
-
Copy full SHA for b943965 - Browse repository at this point
Copy the full SHA b943965View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8009784 - Browse repository at this point
Copy the full SHA 8009784View commit details -
Configuration menu - View commit details
-
Copy full SHA for 23e63e2 - Browse repository at this point
Copy the full SHA 23e63e2View commit details -
- Fix segfaults caused by invalid object creation (GH#66) (thanks, @pipcet!) - Add Config -> default() method (GH#67) (thanks, @magnolia-k!) - Do not fail when a lightweight tag is found in the Tag->foreach() callback (GH#68) (thanks, @pipcet!) - Add Tree::Entry -> file_mode() method (GH#69) (thanks, @pipcet!) - Repository -> merge() now takes %merge_opts and %checkout_opts as 2 separate parameters. (incompatible change) (GH#70) - Merge options parameter member 'automerge' has been renamed to 'favor', inline with libgit2 API changes. (incompatible changes) (GH#70) It has also learned about a 'union' merge. - Checkout options has learned new options: 'target_directory', 'ancestor_label', 'our_label' and 'their_label'. (GH#70) - Checkout strategy has additional options: (GH#70) 'use_ours', 'use_theirs', 'skip_locked_directories', 'dont_overwrite_ignored', 'conflict_style_merge', 'conflict_style_diff3' and 'disable_pathspec_match'. - Added new Repository methods (#GH70): + Repository -> merge_analysis() + Repository -> merge_base() - Added new Index methods (#GH70): + Index -> write_tree_to() + Index -> checkout() + Index -> entries() + Index -> add_conflict() + Index -> remove_conflict() - Added new Commit method (#GH70): + Commit -> merge() - Added new Tree method (#GH70): + Tree -> merge() - Index -> add() now either takes a path or a Index::Entry (GH#70) - Remote->create_inmemory() has been replaced by Remote->create_anonymous() (incompatible change) (GH#71). The order of 'url' and 'fetchspec' has also been reversed to bring it inline with the upstream changes. - Update libgit2 to bcc6229
Configuration menu - View commit details
-
Copy full SHA for 6f273f3 - Browse repository at this point
Copy the full SHA 6f273f3View commit details
Commits on Apr 16, 2014
-
Configuration menu - View commit details
-
Copy full SHA for d2b4f3b - Browse repository at this point
Copy the full SHA d2b4f3bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6741d41 - Browse repository at this point
Copy the full SHA 6741d41View commit details -
Configuration menu - View commit details
-
Copy full SHA for 65eb773 - Browse repository at this point
Copy the full SHA 65eb773View commit details
Commits on Apr 17, 2014
-
Configuration menu - View commit details
-
Copy full SHA for 8b10f9d - Browse repository at this point
Copy the full SHA 8b10f9dView commit details -
Configuration menu - View commit details
-
Copy full SHA for d45d7e0 - Browse repository at this point
Copy the full SHA d45d7e0View commit details -
Configuration menu - View commit details
-
Copy full SHA for b51a6c4 - Browse repository at this point
Copy the full SHA b51a6c4View commit details -
Configuration menu - View commit details
-
Copy full SHA for d237912 - Browse repository at this point
Copy the full SHA d237912View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6852128 - Browse repository at this point
Copy the full SHA 6852128View commit details
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.