summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #2153 from mekishizufu/tag_exampleRussell Belfer2014-03-071-1/+1
|\ \ | |/ |/| Add a tag example
| * Fix typoJiri Pospisil2014-03-051-1/+1
| |
* | Revert pull request #1997revert-1997Vicent Marti2014-03-061-1/+1
| |
* | Merge pull request #1997 from mgbowen/merge-options-init-fixVicent Marti2014-03-061-1/+1
|\ \ | | | | | | Fix GIT_MERGE_OPTS_INIT on MSVC.
| * | Fix GIT_MERGE_OPTS_INIT on MSVC.Matthew Bowen2013-12-091-1/+1
| | |
* | | Added function-based initializers for every options struct.Matthew Bowen2014-03-0514-0/+206
| | | | | | | | | | | | The basic structure of each function is courtesy of arrbee.
* | | Add git_object_short_id API to get short id stringRussell Belfer2014-03-041-0/+10
| | | | | | | | | | | | | | | | | | This finds a short id string that will unambiguously select the given object, starting with the core.abbrev length (usually 7) and growing until it is no longer ambiguous.
* | | Add exists_prefix to ODB backend and ODB APIRussell Belfer2014-03-042-5/+18
| |/ |/|
* | Fix the description for `GIT_FEATURE_SSH`.Arthur Schreiber2014-03-031-1/+1
| |
* | features: Rename `_HAS_` to `_FEATURE_`vmg/featuresVicent Marti2014-03-031-7/+7
| |
* | caps: Rename the enum name too!Vicent Marti2014-03-031-1/+1
| |
* | caps: Rename to features to avoid confusionVicent Marti2014-03-031-8/+13
| |
* | Add buffer to buffer diff and patch APIsRussell Belfer2014-02-272-0/+61
| | | | | | | | | | | | | | | | This adds `git_diff_buffers` and `git_patch_from_buffers`. This also includes a bunch of internal refactoring to increase the shared code between these functions and the blob-to-blob and blob-to-buffer APIs, as well as some higher level assert helpers in the tests to also remove redundancy.
* | Merge pull request #2137 from jru/blame-first-parentBen Straub2014-02-261-0/+3
|\ \ | | | | | | Blame first-parent history
| * | Document enumerator and rewordingJuan Rubén2014-02-241-1/+2
| | |
| * | Add option to limit blame to first parentJuan Rubén2014-02-231-0/+2
| | |
* | | Improve documentation for mergingEdward Thomson2014-02-211-33/+127
| | |
* | | Address PR commentsRussell Belfer2014-02-202-13/+6
| | | | | | | | | | | | | | | | | | | | | * Make GIT_INLINE an internal definition so it cannot be used in public headers * Fix language in CONTRIBUTING * Make index caps API use signed instead of unsigned values
* | | Make git_oid_equal a non-inline APIRussell Belfer2014-02-201-4/+1
|/ /
* | refs: move current_id before the reflog parametersCarlos Martín Nieto2014-02-101-4/+4
| | | | | | | | | | Keep the reflog parameters as the last two, as they're the optional parameters.
* | refs: conditional wording fixupsCarlos Martín Nieto2014-02-101-8/+11
| | | | | | | | | | This addresses arrbee's concerns about wording in the conditional reference udpate functions.
* | Add git_commit_amend APIRussell Belfer2014-02-072-10/+75
| | | | | | | | | | | | | | | | | | This adds an API to amend an existing commit, basically a shorthand for creating a new commit filling in missing parameters from the values of an existing commit. As part of this, I also added a new "sys" API to create a commit using a callback to get the parents. This allowed me to rewrite all the other commit creation APIs so that temporary allocations are no longer needed.
* | Merge pull request #2099 from libgit2/bs/more-reflog-stuffRussell Belfer2014-02-074-5/+39
|\ \ | | | | | | More reflogness
| * | Correct default reflog message for git_remote_fetchBen Straub2014-02-061-1/+2
| | |
| * | Fix terrible indentationBen Straub2014-02-062-2/+2
| | |
| * | Merge remote-tracking branch 'libgit2/development' into bs/more-reflog-stuffBen Straub2014-02-051-6/+12
| |\ \
| * | | Add reflog params to git_repository_detach_headBen Straub2014-02-041-1/+5
| | | |
| * | | Add reflog parameters to remote apisBen Straub2014-02-041-2/+14
| | | | | | | | | | | | Also added a test for git_remote_fetch.
| * | | Add reflog parameters to git_push_update_tipsBen Straub2014-02-041-1/+7
| | | |
| * | | Add reflog parameters to git_resetBen Straub2014-02-031-1/+12
| | | |
* | | | Merge pull request #2042 from libgit2/cmn/conditional-refRussell Belfer2014-02-073-9/+106
|\ \ \ \ | |_|/ / |/| | | refs: conditional ref updates
| * | | refs: add an unconditional deleteCarlos Martín Nieto2014-02-051-0/+11
| | | | | | | | | | | | | | | | | | | | Add it under the git_reference_remove() name, letting the user pass the repo and name, analogous to unconditional setting/creation.
| * | | refs: check the ref's old value when deletingCarlos Martín Nieto2014-02-051-1/+4
| | | | | | | | | | | | | | | | Recognize when the reference has changed since we loaded it.
| * | | refs: placeholder conditional deleteCarlos Martín Nieto2014-02-051-1/+1
| | | | | | | | | | | | | | | | We don't actually pass the old value yet.
| * | | refs: bring conditional symbolic updates to the frontendCarlos Martín Nieto2014-02-051-0/+40
| | | | | | | | | | | | | | | | Bring the race detection goodness to symbolic references as well.
| * | | refdb: add conditional symbolic updatesCarlos Martín Nieto2014-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | Add a parameter to the backend to allow checking for the old symbolic target.
| * | | refs: return GIT_EMODIFIED if the ref target movedCarlos Martín Nieto2014-02-052-2/+5
| | | | | | | | | | | | | | | | | | | | In case we loose the race to update the reference, return GIT_EMODIFIED to let the user distinguish it from other types of errors.
| * | | refs: changes from feedbackCarlos Martín Nieto2014-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change the name to _matching() intead of _if(), and force _set_target() to be a conditional update. If the user doesn't care about the old value, they should use git_reference_create().
| * | | refs: conditional ref updatesCarlos Martín Nieto2014-02-052-6/+46
| |/ / | | | | | | | | | Allow updating references if the old value matches the given one.
* | | Merge pull request #2094 from libgit2/cmn/push-non-commitRussell Belfer2014-02-051-4/+10
|\ \ \ | | | | | | | | Add flexibility to the revwalk API
| * | | revwalk: ignore wrong object type in glob pushesCarlos Martín Nieto2014-02-051-0/+6
| | | | | | | | | | | | | | | | | | | | Pushing a whole namespace can cause us to attempt to push non-committish objects. Catch this situation and special-case it for ignoring this.
| * | | revwalk: accept committish objectsCarlos Martín Nieto2014-02-051-4/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let the user push committish objects and peel them to figure out which commit to push to our queue. This is for convenience and for allowing uses of git_revwalk_push_glob(w, "tags") with annotated tags.
* | | docs: produce literal asterisksCarlos Martín Nieto2014-02-051-2/+2
|/ /
* | Add `git_reference_is_note`.Arthur Schreiber2014-02-021-0/+10
| |
* | Document branch-creation reflog betterBen Straub2014-01-301-1/+3
| |
* | Ensure renaming a reference updates the reflogBen Straub2014-01-301-1/+5
| |
* | Add reflog parameters to git_branch_moveBen Straub2014-01-301-1/+7
| |
* | Augment clone API with reflog parametersBen Straub2014-01-301-1/+6
| |
* | Add reflog params to git_branch_createBen Straub2014-01-301-1/+7
| |
* | Add reflog params to set-head callsBen Straub2014-01-301-2/+10
| |
View Lorry Controller Status