summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2294 from ethomson/merge_checkout_strategyRussell Belfer2014-04-241-5/+3
|\
| * merge: checkout default shouldn't clobber givenEdward Thomson2014-04-231-5/+3
| * merge: default checkout strategy for should be SAFEEdward Thomson2014-04-231-1/+1
* | fetchhead: deal with quotes in branch namesCarlos Martín Nieto2014-04-241-1/+1
|/
* Merge pull request #2291 from ethomson/patch_binaryVicent Marti2014-04-233-6/+164
|\
| * patch: emit binary patches (optionally)Edward Thomson2014-04-223-6/+164
* | Merge pull request #2283 from phkelley/win32_fsVicent Marti2014-04-2318-460/+912
|\ \
| * | React to feedback for UTF-8 <-> WCHAR and reparse workPhilip Kelley2014-04-238-38/+34
| * | Handle win32 reparse points properlyEdward Thomson2014-04-225-132/+353
| * | Win32: UTF-8 <-> WCHAR conversion overhaulPhilip Kelley2014-04-1916-400/+635
* | | Replace math fns with simpler integer mathrb/note-git-diff-index-behaviorRussell Belfer2014-04-221-11/+23
* | | Use git_diff_get_stats in example/diff + refactorRussell Belfer2014-04-222-161/+141
* | | Some doc and examples/diff.c changesRussell Belfer2014-04-221-1/+2
* | | transports: allow the creds callback to say it doesn't existCarlos Martín Nieto2014-04-222-32/+55
* | | remote: provide read access to the callback structureCarlos Martín Nieto2014-04-221-0/+7
* | | Merge pull request #2287 from libgit2/rb/moar-coverity-fixesVicent Marti2014-04-224-18/+16
|\ \ \
| * | | Fix some coverity-found issuesRussell Belfer2014-04-214-18/+16
| | |/ | |/|
* | | Fix reset for staged deletesRussell Belfer2014-04-211-3/+8
|/ /
* | attrcache: fix use-after-freeCarlos Martín Nieto2014-04-211-1/+1
* | sysdir: free the path if we cannot find the fileCarlos Martín Nieto2014-04-211-1/+1
|/
* Merge pull request #2273 from jacquesg/ssh-interactiveVicent Marti2014-04-192-9/+81
|\
| * Only zero sensitive information on destruction (and memory actually allocated...Jacques Germishuys2014-04-181-7/+21
| * Make git_cred_ssh_custom_new() naming more consistentJacques Germishuys2014-04-182-3/+3
| * Introduce git_cred_ssh_interactive_new()Jacques Germishuys2014-04-182-0/+58
* | Merge pull request #2279 from libgit2/rb/moar-eegnöre-fîxésVicent Marti2014-04-197-15/+98
|\ \
| * | Minor fixesRussell Belfer2014-04-184-5/+8
| * | Fix ignore difference from git with trailing /*Russell Belfer2014-04-182-0/+10
| * | Preload attribute files that may contain macrosRussell Belfer2014-04-182-6/+72
| * | Pop ignore only if whole relative path matchesRussell Belfer2014-04-183-6/+10
| |/
* | Merge pull request #2213 from ethomson/safecrlfRussell Belfer2014-04-183-1/+19
|\ \ | |/ |/|
| * Determine crlf safety by statistics, not literal reversibilityEdward Thomson2014-04-071-24/+9
| * Introduce core.safecrlf handlingEdward Thomson2014-04-073-3/+36
* | cred: tighten username rulesCarlos Martín Nieto2014-04-182-50/+14
* | Merge pull request #2108 from libgit2/rb/threadsafe-index-iteratorVicent Marti2014-04-1832-1168/+1795
|\ \
| * | Some memory leak fixesRussell Belfer2014-04-171-26/+28
| * | Fix broken logic for attr cache invalidationRussell Belfer2014-04-178-198/+243
| * | Lock attribute file while reparsing dataRussell Belfer2014-04-173-17/+49
| * | Fix race checking for existing index itemsRussell Belfer2014-04-171-20/+32
| * | Fix tests with new attr cache codeRussell Belfer2014-04-174-57/+109
| * | Attribute file cache refactorRussell Belfer2014-04-1712-696/+818
| * | Minor tree cache speedupsRussell Belfer2014-04-172-17/+11
| * | Fix leak in git_index_conflict_cleanupRussell Belfer2014-04-171-22/+10
| * | Fix leak when using push and pop with ignoresRussell Belfer2014-04-171-0/+3
| * | Fix refcount issues with mutex protected ignoresRussell Belfer2014-04-171-1/+15
| * | Fix threading tests when threads disabledRussell Belfer2014-04-171-10/+10
| * | Clean up index snapshot function namingRussell Belfer2014-04-175-54/+63
| * | Index locking and entry allocation changesRussell Belfer2014-04-174-169/+218
| * | Add diff threading tests and attr file cache locksRussell Belfer2014-04-1710-102/+173
| * | Decouple index iterator sort from indexRussell Belfer2014-04-178-100/+91
| * | Add mutex around index entries changesRussell Belfer2014-04-172-63/+169
View Lorry Controller Status