| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #2661 from swisspol/2656 | Edward Thomson | 2014-11-03 | 1 | -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 Latour | 2014-10-27 | 1 | -2/+2 |
| | | | | | | | | | s_xdemitconf | ||||
| * | | merge: talk about the merging state after git_merge() | Carlos Martín Nieto | 2014-11-02 | 1 | -0/+5 |
| |/ | | | | | Since it's not necessarily obvious, mention the merging state and how to clear it. | ||||
| * | rebase: updates based on PR comments | Edward Thomson | 2014-10-26 | 2 | -17/+16 |
| | | |||||
| * | s/git_merge_head/git_annotated_commit | Edward Thomson | 2014-10-26 | 5 | -70/+109 |
| | | | | | | 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 const | Edward Thomson | 2014-10-26 | 1 | -1/+1 |
| | | |||||
| * | git_rebase: iterators for operations | Edward Thomson | 2014-10-26 | 1 | -0/+27 |
| | | |||||
| * | rebase: preload all operations | Edward Thomson | 2014-10-26 | 1 | -2/+2 |
| | | |||||
| * | rebase: init/open a git_rebase object | Edward Thomson | 2014-10-26 | 2 | -11/+34 |
| | | |||||
| * | git_rebase_next: provide info about the operation | Edward Thomson | 2014-10-26 | 1 | -6/+68 |
| | | |||||
| * | git_rebase_finish: rewrite notes when finishing rebase | Edward Thomson | 2014-10-26 | 1 | -1/+12 |
| | | |||||
| * | Introduce `git_note_author`, `git_note_committer` | Edward Thomson | 2014-10-26 | 1 | -0/+17 |
| | | |||||
| * | Introduce git_rebase_finish to complete a rebase | Edward Thomson | 2014-10-26 | 1 | -0/+12 |
| | | |||||
| * | git_rebase_commit: drop already-picked commits | Edward Thomson | 2014-10-26 | 2 | -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_commit | Edward Thomson | 2014-10-26 | 1 | -0/+28 |
| | | | | | Commit the current patch of a rebase process. | ||||
| * | Introduce git_rebase_next | Edward Thomson | 2014-10-26 | 1 | -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_abort | Edward Thomson | 2014-10-26 | 1 | -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 arg | Edward Thomson | 2014-10-26 | 1 | -1/+1 |
| | | |||||
| * | Introduce git_rebase to set up a rebase session | Edward Thomson | 2014-10-26 | 2 | -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-remove | Edward Thomson | 2014-10-24 | 2 | -15/+0 |
| |\ | | | | | config: remove the refresh function and backend field | ||||
| | * | config: remove the refresh function and backend fieldcmn/config-refresh-remove | Carlos Martín Nieto | 2014-10-23 | 2 | -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-rename | Edward Thomson | 2014-10-24 | 1 | -3/+6 |
| |\ \ | | | | | | | remote: accept a repo and name for renaming | ||||
| | * | | remote: accept a repo and name for renamingcmn/remote-rename | Carlos Martín Nieto | 2014-10-24 | 1 | -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-url | Carlos Martín Nieto | 2014-10-24 | 1 | -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 documentation | Carlos Martín Nieto | 2014-10-18 | 4 | -27/+47 |
| | | |||||
| * | Move un-namespaced constant to internal header | Russell Belfer | 2014-10-10 | 1 | -2/+0 |
| | | | | | FLAG_BITS only seems to be used internally | ||||
| * | Merge pull request #2593 from libgit2/cmn/remote-delete-name | Edward Thomson | 2014-10-10 | 1 | -2/+3 |
| |\ | | | | | remote: accept a repository and remote name for deletion | ||||
| | * | remote: accept a repository and remote name for deletioncmn/remote-delete-name | Carlos Martín Nieto | 2014-09-30 | 1 | -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-typedef | Carlos Martín Nieto | 2014-10-10 | 1 | -6/+4 |
| |\ \ | | | | | | | [factor] Join typedef and struct definitions in single file. | ||||
| | * | | Join typedef and struct definitions in single file. | Ciro Santilli | 2014-09-24 | 1 | -6/+4 |
| | | | | |||||
| * | | | Merge pull request #2588 from swansontec/ssl-cert-path2 | Carlos Martín Nieto | 2014-10-10 | 1 | -1/+13 |
| |\ \ \ | | | | | | | | | Add support for setting the SSL CA location | ||||
| | * | | | Add support for setting the SSL CA location | William Swanson | 2014-09-30 | 1 | -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-callbacks | Carlos Martín Nieto | 2014-10-10 | 1 | -0/+5 |
| |\ \ \ | | | | | | | | | Allow to propagate checkout callbacks to git HARD reset | ||||
| | * | | | Allow to propagate checkout callbacks to git HARD reset | Sven Strickroth | 2014-08-03 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de> | ||||
| * | | | | Merge pull request #2574 from csware/hostname-for-certificate_check_cb | Edward Thomson | 2014-10-10 | 1 | -1/+2 |
| |\ \ \ \ | | | | | | | | | | | Provide host name to certificate_check_cb | ||||
| | * | | | | Provide host name to certificate_check_cb | Sven Strickroth | 2014-09-22 | 1 | -1/+2 |
| | | |/ / | |/| | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de> | ||||
| * | | | | Treat an empty list of refspecs the same as a NULL value. | Arthur Schreiber | 2014-10-10 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Merge pull request #2592 from libgit2/cmn/describe | Carlos Martín Nieto | 2014-10-09 | 4 | -0/+166 |
| |\ \ \ \ | | | | | | | | | | | Implement git-describe | ||||
| | * | | | | describe: document the APIcmn/describe | Carlos Martín Nieto | 2014-09-30 | 1 | -3/+71 |
| | | | | | | |||||
| | * | | | | describe: rename git_describe_opts to git_describe_options | Carlos Martín Nieto | 2014-09-30 | 1 | -5/+9 |
| | | | | | | | | | | | | | | | | | | | | | And implement the option init functions for this and the format options. | ||||
| | * | | | | describe: implement describing the workdir | Carlos Martín Nieto | 2014-09-30 | 1 | -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 steps | Carlos Martín Nieto | 2014-09-30 | 1 | -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 Nieto | 2014-09-30 | 1 | -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/describe | Carlos Martín Nieto | 2014-09-30 | 41 | -728/+1247 |
| | |\ \ \ \ | | |/ / / | |||||
| | * | | | | object: introduce git_describe_object() | nulltoken | 2014-04-30 | 4 | -0/+70 |
| | | | | | | |||||
| * | | | | | Merge pull request #2448 from libgit2/cmn/reference-transaction | Edward Thomson | 2014-10-09 | 4 | -1/+128 |
| |\ \ \ \ \ | | | | | | | | | | | | | Introduce reference transactions | ||||
| | * | | | | | transaction: rename lock() to lock_ref()cmn/reference-transaction | Carlos Martín Nieto | 2014-10-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This leaves space for future expansion to locking other resources without having to change the API for references. | ||||
| | * | | | | | transaction: add documentation | Carlos Martín Nieto | 2014-09-30 | 1 | -2/+88 |
| | | | | | | | |||||
| | * | | | | | Introduce reference transactions | Carlos Martín Nieto | 2014-09-30 | 3 | -0/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A transaction allows you to lock multiple references and set up changes for them before applying the changes all at once (or as close as the backend supports). This can be used for replication purposes, or for making sure some operations run when the reference is locked and thus cannot be changed. | ||||
| | * | | | | | reflog: constify byindex | Carlos Martín Nieto | 2014-09-30 | 1 | -1/+1 |
| | | |/ / / | |/| | | | |||||
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |