summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* rebase: add information to the CHANGELOGed/rebaseEdward Thomson2014-10-261-0/+14
|
* rebase: updates based on PR commentsEdward Thomson2014-10-263-34/+47
|
* s/git_merge_head/git_annotated_commitEdward Thomson2014-10-2621-631/+700
| | | | | Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.
* rebase: clean up some warnings and memory leaksEdward Thomson2014-10-262-26/+15
|
* rebase: oid member of operation should be constEdward Thomson2014-10-262-3/+3
|
* git_rebase: iterators for operationsEdward Thomson2014-10-263-0/+156
|
* rebase: preload all operationsEdward Thomson2014-10-263-125/+165
|
* rebase: init/open a git_rebase objectEdward Thomson2014-10-266-295/+398
|
* git_rebase_next: provide info about the operationEdward Thomson2014-10-263-25/+111
|
* git_rebase_finish: rewrite notes when finishing rebaseEdward Thomson2014-10-263-18/+255
|
* Introduce `git_note_author`, `git_note_committer`Edward Thomson2014-10-263-4/+51
|
* git_rebase_commit: write HEAD's reflog appropriatelyEdward Thomson2014-10-265-35/+67
|
* Introduce git_rebase_finish to complete a rebaseEdward Thomson2014-10-263-1/+131
|
* git_rebase_next: test that we return GIT_ITEROVEREdward Thomson2014-10-261-0/+50
|
* git_rebase_commit: drop already-picked commitsEdward Thomson2014-10-2614-5/+62
| | | | | | 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-265-11/+241
| | | | Commit the current patch of a rebase process.
* git_rebase_next: write conflicts nicely during rebaseEdward Thomson2014-10-262-18/+161
|
* Introduce git_rebase_nextEdward Thomson2014-10-263-0/+228
| | | | | | `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-263-0/+289
| | | | | 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-262-2/+2
|
* Introduce git_rebase to set up a rebase sessionEdward Thomson2014-10-26131-24/+926
| | | | | | Introduce `git_rebase` to set up a rebase session that can then be continued. Immediately, only merge-type rebase is supported.
* Merge pull request #2612 from ethomson/warningsEdward Thomson2014-10-2614-49/+69
|\ | | | | Clean up some warnings
| * Remove unused warning on non-win32Edward Thomson2014-10-261-1/+1
| |
| * iterator: free paths when skipping themEdward Thomson2014-10-261-1/+4
| |
| * revwalk::mergebase test: free memoryEdward Thomson2014-10-261-0/+1
| |
| * mwindow: clean up pack map at shutdownEdward Thomson2014-10-261-0/+2
| |
| * submodule test: free submoduleEdward Thomson2014-10-261-0/+1
| |
| * global: clean up openssl_locks on shutdownEdward Thomson2014-10-261-1/+7
| |
| * clone::local test: isalpha -> git__isalphaEdward Thomson2014-10-261-1/+1
| |
| * config test: clean up memory leakEdward Thomson2014-10-261-0/+1
| |
| * Cleanup memory leak in ssh transportEdward Thomson2014-10-261-34/+28
| |
| * Clean up some memory leaksEdward Thomson2014-10-262-0/+3
| |
| * Clean up various compiler warningsEdward Thomson2014-10-265-11/+20
|/
* Merge from 2660Carlos Martín Nieto2014-10-271-1/+2
|\
| * tests: fix leakCarlos Martín Nieto2014-10-271-0/+1
| |
| * Fix test repo dir not deleted after runningLinquize2014-10-271-1/+1
|/
* Merge pull request #2638 from libgit2/cmn/config-refresh-removeEdward Thomson2014-10-248-135/+1
|\ | | | | config: remove the refresh function and backend field
| * config: remove the refresh function and backend fieldcmn/config-refresh-removeCarlos Martín Nieto2014-10-238-135/+1
| | | | | | | | | | | | 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-245-74/+54
|\ \ | | | | | | remote: accept a repo and name for renaming
| * | remote: accept a repo and name for renamingcmn/remote-renameCarlos Martín Nieto2014-10-245-74/+54
| |/ | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #2649 from swisspol/2630Edward Thomson2014-10-241-2/+3
|\ \ | | | | | | Fixed memory leak in git_tag_delete()
| * | Fixed memory leak in git_tag_delete()Pierre-Olivier Latour2014-10-241-2/+3
| | |
* | | Merge pull request #2647 from ethomson/clar_tmpnameEdward Thomson2014-10-242-0/+6
|\ \ \ | | | | | | | | clar: use a custom temp directory name
| * | | clar: use a custom temp directory nameEdward Thomson2014-10-242-0/+6
| | |/ | |/|
* | | Merge pull request #2645 from libgit2/cmn/common-cryptoEdward Thomson2014-10-243-1/+48
|\ \ \ | |_|/ |/| | [RFC] Use CommonCrypto for hashing
| * | hash: use CommonCrypto on OSX for SHA-1cmn/common-cryptoCarlos Martín Nieto2014-10-243-1/+48
| | | | | | | | | | | | | | | OSX has its own cryptographic library, let's make use of it instead of calling out to OpenSSL.
* | | Merge pull request #2644 from libgit2/cmn/remove-supported-urlEdward Thomson2014-10-244-42/+3
|\ \ \ | |_|/ |/| | remote: delete git_remote_supported_url()
| * | remote: delete git_remote_supported_url()cmn/remove-supported-urlCarlos Martín Nieto2014-10-244-42/+3
|/ / | | | | | | | | | | | | 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.
* | Merge pull request #2622 from libgit2/refresh-config-snapshotCarlos Martín Nieto2014-10-232-2/+20
|\ \ | | | | | | Refresh git configuration before looking for the tracking branch redux.
| * | Patch from @carlosmn to refresh the parent config before snapshotting.refresh-config-snapshotAlan Rogers2014-10-231-1/+6
| | |
View Lorry Controller Status