summaryrefslogtreecommitdiff
path: root/include/git2
Commit message (Collapse)AuthorAgeFilesLines
...
* docs: fix incorrect codeblock on outputEtienne Samson2018-05-071-35/+35
|
* docs: move comment so docurium sees itEtienne Samson2018-05-071-1/+1
|
* docs: standardize comment block for git_*_init_options functionsEtienne Samson2018-05-0716-84/+157
|
* docs: missing documentation commentEtienne Samson2018-05-071-0/+1
|
* docs: move callback-specific documentation to the callbackEtienne Samson2018-05-071-7/+18
|
* docs: fix some comment-marker typosEtienne Samson2018-05-073-3/+3
|
* docs: fix more missing includesEtienne Samson2018-05-074-0/+12
|
* docs: add buffer.h & oid.h to types.hEtienne Samson2018-05-073-0/+5
| | | | Otherwise docurium/clang chokes on the types, and ignores the documentation comments altogether.
* Merge pull request #4640 from mkeeler/worktree-convenience2Patrick Steinhardt2018-04-301-0/+18
|\ | | | | worktree: add functions to get name and path
| * worktree: add functions to get name and pathMatt Keeler2018-04-251-0/+18
| |
* | Merge pull request #4525 from pks-t/pks/config-iterate-in-orderEdward Thomson2018-04-221-0/+1
|\ \ | | | | | | Configuration entry iteration in order
| * | config_file: move include depth into config entryPatrick Steinhardt2018-03-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to reject writes to included configuration entries, we need to keep track of whether an entry was included via another configuration file or not. This information is being stored in the `cvar` structure, which is a rather weird location, as it is only used to create a list structure of config entries. Move the include depth into the structure `git_config_entry` instead. While this fixes the layering issue, it enables users of libgit2 to access the depth, too.
* | | Merge pull request #4524 from pks-t/pks/worktree-refsEdward Thomson2018-04-171-1/+2
|\ \ \ | |_|/ |/| | worktree: add ability to create worktree with pre-existing branch
| * | worktree: add ability to create worktree with pre-existing branchPatrick Steinhardt2018-02-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we always create a new branch after the new worktree's name when creating a worktree. In some workflows, though, the caller may want to check out an already existing reference instead of creating a new one, which is impossible to do right now. Add a new option `ref` to the options structure for adding worktrees. In case it is set, a branch and not already checked out by another worktree, we will re-use this reference instead of creating a new one.
* | | Merge pull request #4597 from cjhoward92/fix/cert-check-docsPatrick Steinhardt2018-04-062-4/+4
|\ \ \ | | | | | | | | remote/proxy: fix git_transport_certificate_check_db description
| * | | remote/proxy: fix git_transport_certificate_check_db commentCarson Howard2018-03-272-4/+4
| | | |
* | | | Merge pull request #4587 from rcjsuen/patch-2Patrick Steinhardt2018-04-061-3/+3
|\ \ \ \ | | | | | | | | | | Flag options in describe.h as being optional
| * | | | Flag options in describe.h as being optionalRemy Suen2018-03-271-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The git_describe_options in git_describe_commit and git_describe_workdir and the git_describe_format_options in git_describe_format are optional and can be NULL. State this in the documentation to make people's lives easier when calling these functions. Signed-off-by: Remy Suen <remy.suen@gmail.com>
* | | | types: remove unused git_merge_resultCarson Howard2018-03-271-3/+0
|/ / / | | | | | | `git_merge_result` is currently unused in the codebase and generates a blank page in the [documentation](https://libgit2.github.com/libgit2/#HEAD/type/git_merge_result).
* | | checkout: change default strategy to SAFEEtienne Samson2018-03-261-2/+2
| |/ |/| | | As per #4200, our default is quite surprising to users that expect checkout to just "do the thing".
* | Merge pull request #4544 from josharian/docsPatrick Steinhardt2018-03-131-18/+35
|\ \ | | | | | | pathspec: improve git_pathspec_flag_t doc rendering
| * | pathspec: improve git_pathspec_flag_t doc renderingJosh Bleecher Snyder2018-02-231-18/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By placing docs per enum value rather than in a large block, the automated doc generation tool can make nicer docs, as could other automated tools, such as the mooted https://github.com/libgit2/git2go/issues/427. The current rendering is somewhat ugly: https://libgit2.github.com/libgit2/#HEAD/type/git_pathspec_flag_t No textual changes, just reorganization.
* | | Merge pull request #4396 from libgit2/cmn/config-regex-is-normalisedEdward Thomson2018-03-121-2/+26
|\ \ \ | | | | | | | | config: specify how we match the regular expressions
| * | | config: explicitly state that subsections are case-sensitivecmn/config-regex-is-normalisedCarlos Martín Nieto2018-03-111-6/+11
| | | |
| * | | config: specify how we match the regular expressionsCarlos Martín Nieto2017-11-181-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do it the same as git does: case-sensitively on the normalized form of the variable name. While here also specify that we're case-sensitive on the values when handling the values when setting or deleting multivars.
* | | | diff: ensure an unsigned number is shiftedJacques Germishuys2018-03-081-3/+3
| | | |
* | | | worktree: lock reason should be constJacques Germishuys2018-03-021-1/+1
| |/ / |/| |
* | | Update version number to v0.27Patrick Steinhardt2018-02-201-3/+3
| | |
* | | odb: provide length and type with streaming readEdward Thomson2018-02-012-2/+10
| |/ |/| | | | | | | The streaming read functionality should provide the length and the type of the object, like the normal read functionality does.
* | Merge pull request #4488 from libgit2/ethomson/conflict_marker_sizeEdward Thomson2018-01-311-0/+6
|\ \ | | | | | | Use longer conflict markers in recursive merge base
| * | merge: allow custom conflict marker sizeEdward Thomson2018-01-211-0/+6
| | | | | | | | | | | | | | | | | | Allow for a custom conflict marker size, allowing callers to override the default size of the "<<<<<<<" and ">>>>>>>" markers in the conflicted output file.
* | | odb: export mempack backendAdrián Medraño Calvo2018-01-221-4/+5
|/ / | | | | | | Fixes #4492, #4496.
* | message: update docs for git_message_prettifycmn/prettify-docsCarlos Martín Nieto2018-01-191-3/+2
| | | | | | | | | | | | | | | | We used to hard-code the octothorpe as the comment character and the documentation still mentions this even though we accept the comment character as a parameter. Update the line to indicate this and clean up the first paragraph a bit.
* | Merge pull request #4451 from libgit2/charliesome/trailer-infoBrian Lopez2018-01-171-0/+41
|\ \ | | | | | | Implement message trailer parsing API
| * | update code docsBrian Lopez2018-01-161-4/+15
| | |
| * | Change trailer API to return a simple arrayBrian Lopez2018-01-161-7/+17
| | |
| * | Merge remote-tracking branch 'origin/master' into charliesome/trailer-infoBrian Lopez2018-01-101-3/+4
| |\ \
| * | | remove empty lines between @-linesBrian Lopez2018-01-031-3/+0
| | | |
| * | | Merge remote-tracking branch 'origin/master' into charliesome/trailer-infoBrian Lopez2018-01-021-0/+89
| |\ \ \
| * | | | message: add routine for parsing trailers from messagesCharlie Somerville2017-12-191-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | This is implemented in trailer.c and borrows a large amount of logic from Git core to ensure compatibility.
* | | | | refs: document need to free refs in foreach-callbackPatrick Steinhardt2018-01-121-0/+3
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | References passed to the callback function of `git_reference_foreach` are expected to be owned by the callback. As such, they are never being freed by `git_reference_foreach`, but will have to be freed by the caller. This small detail is never mentioned in the function's documentation, though, making it easy to get wrong. Document this to make it discoverable.
* | | | docs: git_treebuilder_insert validates entriesethomson/treebuilder_docsEdward Thomson2017-12-311-3/+4
| |/ / |/| | | | | | | | | | | | | | | | | The documentation for `git_treebuilder_insert` erroneously states that we do not validate that the entry being inserted exists. We do, as of https://github.com/libgit2/libgit2/pull/3633. Update the documentation to reflect the new reality.
* | | Merge pull request #4159 from richardipsum/notes-commitEdward Thomson2017-12-301-0/+89
|\ \ \ | |/ / |/| | Support using notes via a commit rather than a ref
| * | notes: Add git_note_commit_iterator_newRichard Ipsum2017-10-071-0/+14
| | | | | | | | | | | | This also adds tests for this function.
| * | notes: Add git_note_commit_removeRichard Ipsum2017-10-071-0/+26
| | | | | | | | | | | | This also adds tests for this function.
| * | notes: Add git_note_commit_readRichard Ipsum2017-10-071-0/+19
| | | | | | | | | | | | This also adds tests for this function.
| * | notes: Add git_note_commit_createRichard Ipsum2017-10-071-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new function that will allow creation of notes without necessarily updating a particular ref, the notes tree is obtained from the git_commit object parameter, a new commit object pointing to the current tip of the notes tree is optionally returned via the 'note_commit_out' parameter, optionally the blob id for the note is returned through the 'note_blob_out' object.
* | | Merge pull request #4318 from Uncommon/amend_statusEdward Thomson2017-12-011-0/+4
|\ \ \ | | | | | | | | Add git_status_file_at
| * | | status: Add a baseline field to git_status_options for comparing to trees ↵David Catmull2017-11-301-0/+4
| | |/ | |/| | | | | | | other than HEAD
* | | diff: expose the "indent heuristic" in the diff optionsCarlos Martín Nieto2017-11-191-0/+6
| | | | | | | | | | | | | | | We default to off, but we might want to consider changing `GIT_DIFF_NORMAL` to include it.
View Lorry Controller Status