summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix segmentation fault observed on OpenBSD/sparc64cmn/mmap-readableStefan Sperling2014-11-031-4/+2
* remote: fix tagopt testCarlos Martín Nieto2014-11-021-7/+7
* merge: talk about the merging state after git_merge()Carlos Martín Nieto2014-11-021-0/+5
* Merge pull request #2669 from ethomson/revert_test_fixEdward Thomson2014-10-2713-12/+8
|\
| * revert tests: always use core.autocrlf=false in testsEdward Thomson2014-10-2713-12/+8
|/
* Merge pull request #2659 from swisspol/static_analysisEdward Thomson2014-10-275-8/+3
|\
| * Fixed potential crash with uninitialized variablesPierre-Olivier Latour2014-10-272-2/+2
| * Removed some useless variable assignmentsPierre-Olivier Latour2014-10-274-6/+1
|/
* Merge pull request #2666 from libgit2/cmn/threadsafe-onEdward Thomson2014-10-273-2/+5
|\
| * Flip THREADSAFE's default to ONcmn/threadsafe-onCarlos Martín Nieto2014-10-273-2/+5
* | 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
* | Merge branch 'csware/cleanup'Edward Thomson2014-10-261-8/+6
|\ \
| * | Minor cleanup: Use defined no_check_cert_flags instead of C&P them againSven Strickroth2014-10-261-8/+6
|/ /
* | Merge pull request #2482 from libgit2/ed/rebaseEdward Thomson2014-10-26169-566/+3381
|\ \
| * | 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
| * | 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
| * | Introduce git_rebase_commitEdward Thomson2014-10-265-11/+241
| * | git_rebase_next: write conflicts nicely during rebaseEdward Thomson2014-10-262-18/+161
| * | Introduce git_rebase_nextEdward Thomson2014-10-263-0/+228
| * | Introduce git_rebase_abortEdward Thomson2014-10-263-0/+289
| * | 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
|/ /
* | Merge pull request #2612 from ethomson/warningsEdward Thomson2014-10-2614-49/+69
|\ \
| * | 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
View Lorry Controller Status