summaryrefslogtreecommitdiff
path: root/include/git2
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2676 from libgit2/cmn/threadingEdward Thomson2014-11-061-0/+16
|\ | | | | Threading and crypto libraries
| * ssl: separate locking init from general initCarlos Martín Nieto2014-11-011-0/+16
| | | | | | | | | | Extract the lock-setting functions into their own, as we cannot assume that it's ok for us to set this unconditionally.
* | Merge pull request #2661 from swisspol/2656Edward Thomson2014-11-031-2/+2
|\ \ | | | | | | Changed context_lines and interhunk_lines to uint32_t to match struct s_xdemitconf
| * | Changed context_lines and interhunk_lines to uint32_t to match struct ↵Pierre-Olivier Latour2014-10-271-2/+2
| |/ | | | | | | s_xdemitconf
* | merge: talk about the merging state after git_merge()Carlos Martín Nieto2014-11-021-0/+5
|/ | | | | Since it's not necessarily obvious, mention the merging state and how to clear it.
* rebase: updates based on PR commentsEdward Thomson2014-10-261-17/+15
|
* s/git_merge_head/git_annotated_commitEdward Thomson2014-10-264-70/+108
| | | | | Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.
* rebase: oid member of operation should be constEdward Thomson2014-10-261-1/+1
|
* git_rebase: iterators for operationsEdward Thomson2014-10-261-0/+27
|
* rebase: preload all operationsEdward Thomson2014-10-261-2/+2
|
* rebase: init/open a git_rebase objectEdward Thomson2014-10-262-11/+34
|
* git_rebase_next: provide info about the operationEdward Thomson2014-10-261-6/+68
|
* git_rebase_finish: rewrite notes when finishing rebaseEdward Thomson2014-10-261-1/+12
|
* Introduce `git_note_author`, `git_note_committer`Edward Thomson2014-10-261-0/+17
|
* Introduce git_rebase_finish to complete a rebaseEdward Thomson2014-10-261-0/+12
|
* git_rebase_commit: drop already-picked commitsEdward Thomson2014-10-262-1/+4
| | | | | | Already cherry-picked commits should not be re-included. If all changes included in a commit exist in the upstream, then we should error with GIT_EAPPLIED.
* Introduce git_rebase_commitEdward Thomson2014-10-261-0/+28
| | | | Commit the current patch of a rebase process.
* Introduce git_rebase_nextEdward Thomson2014-10-261-0/+13
| | | | | | `git_rebase_next` will apply the next patch (or cherry-pick) operation, leaving the results checked out in the index / working directory so that consumers can resolve any conflicts, as appropriate.
* Introduce git_rebase_abortEdward Thomson2014-10-261-0/+13
| | | | | Abort an in-progress rebase and move the working directory and repository back to the ORIG_HEAD state.
* git_reset: const the git_signature argEdward Thomson2014-10-261-1/+1
|
* Introduce git_rebase to set up a rebase sessionEdward Thomson2014-10-262-0/+74
| | | | | | Introduce `git_rebase` to set up a rebase session that can then be continued. Immediately, only merge-type rebase is supported.
* Merge pull request #2638 from libgit2/cmn/config-refresh-removeEdward Thomson2014-10-242-15/+0
|\ | | | | config: remove the refresh function and backend field
| * config: remove the refresh function and backend fieldcmn/config-refresh-removeCarlos Martín Nieto2014-10-232-15/+0
| | | | | | | | | | | | We have been refreshing on read and write for a while now, so git_config_refresh() is at best a no-op, and might just end up wasting cycles.
* | Merge pull request #2646 from libgit2/cmn/remote-renameEdward Thomson2014-10-241-3/+6
|\ \ | | | | | | remote: accept a repo and name for renaming
| * | remote: accept a repo and name for renamingcmn/remote-renameCarlos Martín Nieto2014-10-241-3/+6
| |/ | | | | | | | | | | | | | | | | | | Remote objects are not meant to be changed from under the user. We did this in rename, but only the name and left the refspecs, such that a save would save the wrong refspecs (and a fetch and anything else would use the wrong refspecs). Instead, let's simply take a name and not change any loaded remote from under the user.
* | remote: delete git_remote_supported_url()cmn/remove-supported-urlCarlos Martín Nieto2014-10-241-13/+0
|/ | | | | | | This function does not in fact tell us anything, as almost anything with a colon in it is a valid rsync-style SSH path; it can not tell us that we do not support ftp or afp or similar as those are still valid SSH paths and we do support that.
* Update some documentationCarlos Martín Nieto2014-10-184-27/+47
|
* Move un-namespaced constant to internal headerRussell Belfer2014-10-101-2/+0
| | | | FLAG_BITS only seems to be used internally
* Merge pull request #2593 from libgit2/cmn/remote-delete-nameEdward Thomson2014-10-101-2/+3
|\ | | | | remote: accept a repository and remote name for deletion
| * remote: accept a repository and remote name for deletioncmn/remote-delete-nameCarlos Martín Nieto2014-09-301-2/+3
| | | | | | | | | | | | | | | | We don't need the remote loaded, and the function extracted both of these from the git_remote in order to do its work, so let's remote a step and not ask for the loaded remote at all. This fixes #2390.
* | Merge pull request #2575 from cirosantilli/factor-struct-typedefCarlos Martín Nieto2014-10-101-6/+4
|\ \ | | | | | | [factor] Join typedef and struct definitions in single file.
| * | Join typedef and struct definitions in single file.Ciro Santilli2014-09-241-6/+4
| | |
* | | Merge pull request #2588 from swansontec/ssl-cert-path2Carlos Martín Nieto2014-10-101-1/+13
|\ \ \ | | | | | | | | Add support for setting the SSL CA location
| * | | Add support for setting the SSL CA locationWilliam Swanson2014-09-301-1/+13
| | |/ | |/| | | | | | | | | | This allows users to specify self-signed certificates, or to provide their own certificate stores on limited platforms such as mobile phones.
* | | Merge pull request #2499 from csware/hard-reset-checkout-callbacksCarlos Martín Nieto2014-10-101-0/+5
|\ \ \ | | | | | | | | Allow to propagate checkout callbacks to git HARD reset
| * | | Allow to propagate checkout callbacks to git HARD resetSven Strickroth2014-08-031-0/+5
| | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | | Merge pull request #2574 from csware/hostname-for-certificate_check_cbEdward Thomson2014-10-101-1/+2
|\ \ \ \ | | | | | | | | | | Provide host name to certificate_check_cb
| * | | | Provide host name to certificate_check_cbSven Strickroth2014-09-221-1/+2
| | |/ / | |/| | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | | Treat an empty list of refspecs the same as a NULL value.Arthur Schreiber2014-10-101-3/+3
| | | |
* | | | Merge pull request #2592 from libgit2/cmn/describeCarlos Martín Nieto2014-10-093-0/+165
|\ \ \ \ | | | | | | | | | | Implement git-describe
| * | | | describe: document the APIcmn/describeCarlos Martín Nieto2014-09-301-3/+71
| | | | |
| * | | | describe: rename git_describe_opts to git_describe_optionsCarlos Martín Nieto2014-09-301-5/+9
| | | | | | | | | | | | | | | | | | | | And implement the option init functions for this and the format options.
| * | | | describe: implement describing the workdirCarlos Martín Nieto2014-09-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we describe the workdir, we perform a describe on HEAD and then check to see if the worktree is dirty. If it is and we have a suffix string, we append that to the buffer.
| * | | | describe: split into gather and format stepsCarlos Martín Nieto2014-09-301-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of printing out to the buffer inside the information-gathering phase, write the data to a intermediate result structure. This allows us to split the options into gathering options and formatting options, simplifying the gathering code.
| * | | | describe: rename _object() to _commit()Carlos Martín Nieto2014-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | We don't describe arbitrary object, so let's give it the name of the one object type we accept.
| * | | | Merge remote-tracking branch 'upstream/master' into cmn/describeCarlos Martín Nieto2014-09-3041-728/+1247
| |\ \ \ \ | | |/ / /
| * | | | object: introduce git_describe_object()nulltoken2014-04-303-0/+69
| | | | |
* | | | | Merge pull request #2448 from libgit2/cmn/reference-transactionEdward Thomson2014-10-094-1/+128
|\ \ \ \ \ | | | | | | | | | | | | Introduce reference transactions
| * | | | | transaction: rename lock() to lock_ref()cmn/reference-transactionCarlos Martín Nieto2014-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This leaves space for future expansion to locking other resources without having to change the API for references.
| * | | | | transaction: add documentationCarlos Martín Nieto2014-09-301-2/+88
| | | | | |
View Lorry Controller Status