summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2695 from libgit2/cmn/remote-lookupEdward Thomson2014-11-083-9/+9
|\
| * remote: rename _load() to _lookup()cmn/remote-lookupCarlos Martín Nieto2014-11-083-9/+9
* | Merge pull request #2696 from libgit2/cmn/empty-objectsEdward Thomson2014-11-081-1/+23
|\ \
| * | odb: hardcode the empty blob and treecmn/empty-objectsCarlos Martín Nieto2014-11-081-1/+23
| |/
* | git_status_file now takes an exact pathUngureanu Marius2014-11-071-1/+2
|/
* iterator: submodules are determined by an index or treecmn/submodule-and-dirCarlos Martín Nieto2014-11-077-9/+94
* checkout_index: Remove stage 0 when checking out conflictsEdward Thomson2014-11-061-3/+17
* checkout_index: remove conflicts when checking out new filesEdward Thomson2014-11-061-48/+137
* Merge pull request #2598 from libgit2/cmn/stacked-ignoreEdward Thomson2014-11-062-0/+28
|\
| * ignore: don't leak rules into higher directoriescmn/stacked-ignoreCarlos Martín Nieto2014-11-062-0/+28
* | Merge pull request #2676 from libgit2/cmn/threadingEdward Thomson2014-11-061-18/+24
|\ \
| * | ssl: separate locking init from general initCarlos Martín Nieto2014-11-011-18/+23
| * | ssl: clear the OpenSSL locking functionCarlos Martín Nieto2014-11-011-0/+1
* | | Merge pull request #2682 from libgit2/cmn/fetch-tags-refspecEdward Thomson2014-11-061-0/+1
|\ \ \ | |_|/ |/| |
| * | remote: check the relevance of the refspec when updating FETCH_HEADcmn/fetch-tags-refspecCarlos Martín Nieto2014-11-031-0/+1
| |/
* | Merge pull request #2688 from libgit2/cmn/ignore-file-trailing-crEdward Thomson2014-11-051-1/+10
|\ \
| * | ignore: consider files with a CR in their namescmn/ignore-file-trailing-crCarlos Martín Nieto2014-11-051-1/+10
* | | git_remote_rename: propogate GIT_ENOTFOUNDEdward Thomson2014-11-031-1/+1
* | | Merge pull request #2679 from jfultz/missing-includeEdward Thomson2014-11-031-6/+12
|\ \ \
| * | | Clean up issues include.path issues found during code review.John Fultz2014-11-021-2/+9
| * | | Make config reading continue after hitting a missing include file.John Fultz2014-11-011-7/+6
| | |/ | |/|
* | | Merge pull request #2661 from swisspol/2656Edward Thomson2014-11-031-1/+1
|\ \ \ | |_|/ |/| |
| * | Changed context_lines and interhunk_lines to uint32_t to match struct s_xdemi...Pierre-Olivier Latour2014-10-271-1/+1
* | | Merge pull request #2683 from libgit2/cmn/remote-unifyEdward Thomson2014-11-031-21/+2
|\ \ \
| * | | remote: unify the creation codecmn/remote-unifyCarlos Martín Nieto2014-11-021-21/+2
| | |/ | |/|
* | | Merge pull request #2680 from libgit2/cmn/invalid-cert-returnEdward Thomson2014-11-031-1/+1
|\ \ \
| * | | netops: return GIT_ECERTIFICATE when it fails the basic testscmn/invalid-cert-returnCarlos Martín Nieto2014-11-021-1/+1
| |/ /
* | | Merge pull request #2685 from libgit2/cmn/mmap-readableEdward Thomson2014-11-031-4/+2
|\ \ \
| * | | Fix segmentation fault observed on OpenBSD/sparc64cmn/mmap-readableStefan Sperling2014-11-031-4/+2
| |/ /
* | | Make the Visual Studio compiler happyJacques Germishuys2014-11-031-7/+8
|/ /
* | Fixed potential crash with uninitialized variablesPierre-Olivier Latour2014-10-272-2/+2
* | Removed some useless variable assignmentsPierre-Olivier Latour2014-10-274-6/+1
|/
* Merge commit 'refs/pull/2366/head' of github.com:libgit2/libgit2Carlos Martín Nieto2014-10-278-24/+29
|\
| * Fix compiler warning (git_off_t cast to size_t).Albert Meltzer2014-05-198-24/+29
* | Minor cleanup: Use defined no_check_cert_flags instead of C&P them againSven Strickroth2014-10-261-8/+6
* | rebase: updates based on PR commentsEdward Thomson2014-10-261-17/+31
* | s/git_merge_head/git_annotated_commitEdward Thomson2014-10-265-178/+205
* | rebase: clean up some warnings and memory leaksEdward Thomson2014-10-261-26/+14
* | rebase: oid member of operation should be constEdward Thomson2014-10-261-2/+2
* | git_rebase: iterators for operationsEdward Thomson2014-10-261-0/+21
* | rebase: preload all operationsEdward Thomson2014-10-261-111/+151
* | rebase: init/open a git_rebase objectEdward Thomson2014-10-261-234/+276
* | git_rebase_next: provide info about the operationEdward Thomson2014-10-261-2/+9
* | git_rebase_finish: rewrite notes when finishing rebaseEdward Thomson2014-10-261-16/+150
* | Introduce `git_note_author`, `git_note_committer`Edward Thomson2014-10-262-4/+34
* | git_rebase_commit: write HEAD's reflog appropriatelyEdward Thomson2014-10-264-34/+58
* | Introduce git_rebase_finish to complete a rebaseEdward Thomson2014-10-261-1/+62
* | git_rebase_commit: drop already-picked commitsEdward Thomson2014-10-261-4/+15
* | Introduce git_rebase_commitEdward Thomson2014-10-263-11/+122
* | git_rebase_next: write conflicts nicely during rebaseEdward Thomson2014-10-261-18/+102
View Lorry Controller Status