summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ignore: don't leak rules into higher directoriescmn/stacked-ignoreCarlos Martín Nieto2014-11-062-0/+28
* ignore: add failing test for a file mentioning the parentCarlos Martín Nieto2014-11-061-0/+32
* Merge pull request #2688 from libgit2/cmn/ignore-file-trailing-crEdward Thomson2014-11-052-1/+42
|\
| * ignore: consider files with a CR in their namescmn/ignore-file-trailing-crCarlos Martín Nieto2014-11-052-1/+42
* | Merge pull request #2686 from ethomson/rename_notfoundCarlos Martín Nieto2014-11-032-1/+10
|\ \
| * | git_remote_rename: propogate GIT_ENOTFOUNDEdward Thomson2014-11-032-1/+10
|/ /
* | Merge pull request #2679 from jfultz/missing-includeEdward Thomson2014-11-032-6/+28
|\ \
| * | Clean up issues include.path issues found during code review.John Fultz2014-11-022-5/+13
| * | Make config reading continue after hitting a missing include file.John Fultz2014-11-012-7/+21
* | | Merge pull request #2661 from swisspol/2656Edward Thomson2014-11-033-3/+8
|\ \ \ | |_|/ |/| |
| * | Changed context_lines and interhunk_lines to uint32_t to match struct s_xdemi...Pierre-Olivier Latour2014-10-273-3/+8
* | | 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
| | |/ / | |/| |
* | | | Merge pull request #2684 from jacquesg/openssl-windowsEdward Thomson2014-11-031-7/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Make the Visual Studio compiler happyJacques Germishuys2014-11-031-7/+8
|/ / /
* | | 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
View Lorry Controller Status