summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Fixed invalid error handling in git_repository_open_ext()Pierre-Olivier Latour2015-06-231-1/+1
* Merge pull request #3222 from git-up/conflictedEdward Thomson2015-06-231-2/+4
|\
| * Fixed GIT_DELTA_CONFLICTED not returned in some casesPierre-Olivier Latour2015-06-231-2/+4
* | Merge pull request #3226 from libgit2/cmn/racy-diff-againEdward Thomson2015-06-234-5/+65
|\ \
| * | index: check racily clean entries more thoroughlyCarlos Martín Nieto2015-06-221-2/+41
| * | diff: check files with the same or newer timestampsCarlos Martín Nieto2015-06-223-3/+24
* | | repository: check the format versioncmn/repo-version-checkCarlos Martín Nieto2015-06-231-9/+26
* | | repository: don't error out if there is no versionCarlos Martín Nieto2015-06-231-2/+7
| |/ |/|
* | Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge()Pierre-Olivier Latour2015-06-221-0/+11
* | crlf: give Unix the glory of autocrlf=trueEdward Thomson2015-06-221-13/+14
* | git_buf_text_lf_to_crlf: allow mixed line endingsEdward Thomson2015-06-222-8/+5
* | crlf: use statistics to control to workdir filterEdward Thomson2015-06-221-4/+25
* | Merge pull request #3240 from libgit2/cmn/commit-header-fieldEdward Thomson2015-06-221-0/+55
|\ \
| * | commit: allow retrieving an arbitrary header fieldcmn/commit-header-fieldCarlos Martín Nieto2015-06-221-0/+55
| |/
* | Write modified index in git_stash_apply()Pierre-Olivier Latour2015-06-211-0/+2
|/
* diff: preserve original mode in the indexEdward Thomson2015-06-203-12/+16
* Merge pull request #3236 from libgit2/cmn/index-checksumEdward Thomson2015-06-204-14/+49
|\
| * index: make relative comparison use the checksum as wellcmn/index-checksumCarlos Martín Nieto2015-06-204-9/+6
| * index: use the checksum to check whether it's been modifiedCarlos Martín Nieto2015-06-192-5/+43
* | Fixed Xcode 6.1 build warningsPierre-Olivier Latour2015-06-172-1/+2
|/
* Merge pull request #3219 from libgit2/cmn/racy-diffCarlos Martín Nieto2015-06-176-3/+86
|\
| * checkout: allow workdir to contain checkout targetethomson/racy-diffcmn/racy-diffEdward Thomson2015-06-161-3/+14
| * Introduce p_utimes and p_futimesEdward Thomson2015-06-164-1/+54
| * crlf: tick the index forward to work around racy-git behaviourCarlos Martín Nieto2015-06-161-0/+1
| * index: zero the size of racily-clean entriesCarlos Martín Nieto2015-06-161-0/+18
* | Merge pull request #3209 from libgit2/cmn/double-authorEdward Thomson2015-06-161-0/+10
|\ \
| * | commit: ignore multiple author fieldscmn/double-authorCarlos Martín Nieto2015-06-111-0/+10
* | | remote: return EINVALIDSPEC when given an empty URLcmn/url-emptyCarlos Martín Nieto2015-06-161-2/+6
* | | Merge pull request #3221 from git-up/build_warningsCarlos Martín Nieto2015-06-164-5/+4
|\ \ \ | |_|/ |/| |
| * | Fixed Xcode 6.1 build warningsPierre-Olivier Latour2015-06-154-5/+4
* | | Merge pull request #3216 from dprofeta/fixTransactionVisibilityEdward Thomson2015-06-151-0/+1
|\ \ \ | |/ / |/| |
| * | Fix visibility of transaction symbolDamien PROFETA2015-06-121-0/+1
* | | path: remove unnecessary readdir_r usagecmn/readdirCarlos Martín Nieto2015-06-152-5/+4
* | | Merge pull request #3171 from libgit2/cmn/link-fallbackCarlos Martín Nieto2015-06-151-2/+15
|\ \ \
| * | | clone: fall back to copying when linking does not workcmn/link-fallbackCarlos Martín Nieto2015-06-011-2/+15
* | | | Fix in stransport_stream.c for usage of SecCopyErrorMessageString(), which is...Logan Collins2015-06-151-0/+5
* | | | Merge pull request #3177 from ethomson/binary_diffCarlos Martín Nieto2015-06-157-209/+452
|\ \ \ \
| * | | | patch: include diff options on blob->blob diffsEdward Thomson2015-06-121-1/+2
| * | | | diff: introduce binary diff callbacksEdward Thomson2015-06-127-208/+450
| | |/ / | |/| |
* | | | Merge pull request #3215 from jeffhostetler/windows_leak_diriterCarlos Martín Nieto2015-06-121-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fix memory leak on windows in diriter.Jeff Hostetler2015-06-121-0/+2
* | | | Fixed some Secure Transport issues on OS XPierre-Olivier Latour2015-06-111-20/+36
| |_|/ |/| |
* | | Merge pull request #3205 from ethomson/crlf_queryCarlos Martín Nieto2015-06-111-1/+23
|\ \ \
| * | | Introduce `git_filter_list_contains`Edward Thomson2015-06-101-1/+23
* | | | Merge pull request #3174 from libgit2/cmn/idx-fill-holeEdward Thomson2015-06-101-3/+4
|\ \ \ \
| * | | | indexer: use lseek to extend the packfilecmn/idx-fill-holeCarlos Martín Nieto2015-06-021-3/+4
| | |_|/ | |/| |
* | | | Fixed handling of GIT_DELTA_CONFLICTED in git_diff_find_similar()Pierre-Olivier Latour2015-06-101-4/+4
| |/ / |/| |
* | | filter: close the descriptor in case of errorcmn/coverityCarlos Martín Nieto2015-06-101-2/+3
* | | object: correct the expected ID size in prefix lookupCarlos Martín Nieto2015-06-101-5/+5
* | | pack: use git_buf when building the index nameCarlos Martín Nieto2015-06-101-10/+11