summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* remote: insert refspecs with no rhs in FETCH_HEADcmn/fetch-spec-fetchheadCarlos Martín Nieto2015-06-252-3/+58
* Merge pull request #3228 from git-up/diff_mergeCarlos Martín Nieto2015-06-232-0/+47
|\
| * Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge()Pierre-Olivier Latour2015-06-222-0/+47
|/
* Merge pull request #3199 from ethomson/crlfCarlos Martín Nieto2015-06-221408-132/+8265
|\
| * crlf: give Unix the glory of autocrlf=trueEdward Thomson2015-06-221-13/+14
| * crlf tests: ensure that Unix obeys autocrlf=trueEdward Thomson2015-06-222-60/+17
| * git_buf_text_lf_to_crlf: allow mixed line endingsEdward Thomson2015-06-223-16/+36
| * crlf: use statistics to control to workdir filterEdward Thomson2015-06-221-4/+25
| * clar: support hierarchical test resource dataEdward Thomson2015-06-221-1/+14
| * crlf tests: posix known-good dataEdward Thomson2015-06-22684-0/+3960
| * crlf tests: windows known-good dataEdward Thomson2015-06-22685-0/+3961
| * crlf tests: use known-good data produced by gitEdward Thomson2015-06-221-36/+156
| * crlf: script to generate expected crlf dataEdward Thomson2015-06-221-0/+73
| * crlf: include utf8 resources in master branchEdward Thomson2015-06-2218-9/+11
| * crlf: include additional test resourcesEdward Thomson2015-06-2216-1/+6
|/
* Merge pull request #3240 from libgit2/cmn/commit-header-fieldEdward Thomson2015-06-224-0/+107
|\
| * commit: allow retrieving an arbitrary header fieldcmn/commit-header-fieldCarlos Martín Nieto2015-06-224-0/+107
* | Merge pull request #3239 from git-up/stash_indexCarlos Martín Nieto2015-06-221-0/+2
|\ \ | |/ |/|
| * Write modified index in git_stash_apply()Pierre-Olivier Latour2015-06-211-0/+2
|/
* Merge pull request #3233 from ethomson/status_typechangeCarlos Martín Nieto2015-06-204-12/+64
|\
| * diff: preserve original mode in the indexEdward Thomson2015-06-203-12/+16
| * status: test that symlinks don't lose their modeEdward Thomson2015-06-201-0/+48
|/
* Merge pull request #3238 from git-up/double_freeEdward Thomson2015-06-201-2/+0
|\
| * Fixed index being double-freed in stash testsPierre-Olivier Latour2015-06-201-2/+0
* | Merge pull request #3236 from libgit2/cmn/index-checksumEdward Thomson2015-06-206-16/+63
|\ \ | |/ |/|
| * 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-193-5/+55
| * index: user a better assertion when comparing sizesCarlos Martín Nieto2015-06-191-2/+2
* | Merge pull request #3232 from Therzok/patch-2Carlos Martín Nieto2015-06-201-1/+1
|\ \
| * | Quote LIBSSH2_LIBRARIES callMarius Ungureanu2015-06-191-1/+1
* | | tests: tick over five seconds instead of oneCarlos Martín Nieto2015-06-201-1/+1
|/ /
* | Merge pull request #3229 from git-up/build_warningsCarlos Martín Nieto2015-06-173-2/+2
|\ \
| * | Fixed Xcode 6.1 build warningsPierre-Olivier Latour2015-06-173-2/+2
|/ /
* | Merge pull request #3227 from jeffhostetler/memory_leak__tests_network_refspecsCarlos Martín Nieto2015-06-171-0/+2
|\ \ | |/ |/|
| * Fix memory leak in tests/network/refspecs.cJeff Hostetler2015-06-171-0/+2
|/
* Merge pull request #3219 from libgit2/cmn/racy-diffCarlos Martín Nieto2015-06-1714-7/+229
|\
| * checkout: allow workdir to contain checkout targetethomson/racy-diffcmn/racy-diffEdward Thomson2015-06-161-3/+14
| * merge::workdir::dirty: tick idx to defeat racy-gitEdward Thomson2015-06-161-0/+12
| * Introduce p_utimes and p_futimesEdward Thomson2015-06-166-6/+110
| * tests: tick the index when we count OID calculationsCarlos Martín Nieto2015-06-165-19/+34
| * crlf: tick the index forward to work around racy-git behaviourCarlos Martín Nieto2015-06-162-4/+27
| * index: zero the size of racily-clean entriesCarlos Martín Nieto2015-06-161-0/+18
| * diff: add failing test for racy-git in the indexCarlos Martín Nieto2015-06-161-0/+39
* | Merge pull request #3209 from libgit2/cmn/double-authorEdward Thomson2015-06-162-0/+17
|\ \
| * | commit: ignore multiple author fieldscmn/double-authorCarlos Martín Nieto2015-06-112-0/+17
* | | Merge pull request #3225 from libgit2/cmn/url-emptyEdward Thomson2015-06-161-2/+6
|\ \ \
| * | | 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-167-17/+24
|\ \ \ | |_|/ |/| |
| * | Fixed Xcode 6.1 build warningsPierre-Olivier Latour2015-06-157-17/+24
* | | Merge pull request #3216 from dprofeta/fixTransactionVisibilityEdward Thomson2015-06-151-0/+1
|\ \ \ | |/ / |/| |