summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #2337 from ethomson/merge_ffVicent Marti2014-05-283-34/+125
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCEEdward Thomson2014-05-273-31/+32
| * | | | Staticify `merge_config`Edward Thomson2014-05-271-1/+1
| * | | | Use a config snapshotEdward Thomson2014-05-271-1/+1
| * | | | Move GIT_MERGE_CONFIG_* to its own enumEdward Thomson2014-05-273-43/+61
| * | | | Introduce GIT_MERGE_CONFIG_* for merge.ff settingsEdward Thomson2014-05-273-9/+81
|/ / / /
* | | | Merge pull request #2382 from mikeando/doc_fixesCarlos Martín Nieto2014-05-2610-34/+31
|\ \ \ \
| * | | | Fixed miscellaneous documentation errors.Michael Anderson2014-05-2310-34/+31
|/ / / /
* | | | odb: clear backend errors on successful readCarlos Martín Nieto2014-05-231-0/+1
| |_|/ |/| |
* | | smart: initialize the error variableCarlos Martín Nieto2014-05-221-1/+1
* | | Plug leaks and fix a C99-ismCarlos Martín Nieto2014-05-223-13/+16
* | | Merge pull request #2376 from libgit2/cmn/remote-symrefVicent Marti2014-05-2211-98/+284
|\ \ \
| * | | clone: get rid of head_infocmn/remote-symrefCarlos Martín Nieto2014-05-211-23/+12
| * | | clone: make use of the remote's default branch guessingCarlos Martín Nieto2014-05-211-67/+17
| * | | remote: add api to guess the remote's default branchCarlos Martín Nieto2014-05-213-0/+115
| * | | local transport: expose the symref dataCarlos Martín Nieto2014-05-211-4/+18
| * | | remote: expose the remote's symref mappingsCarlos Martín Nieto2014-05-214-0/+43
| * | | smart: store reported symrefsCarlos Martín Nieto2014-05-213-7/+82
| | |/ | |/|
* | | Merge pull request #2375 from libgit2/rb/safecrlf-on-lf-platformVicent Marti2014-05-223-3/+25
|\ \ \
| * | | Just don't CRLF filter if there are no CRsrb/safecrlf-on-lf-platformRussell Belfer2014-05-191-3/+5
| * | | Make core.safecrlf work on LF-ending platformsRussell Belfer2014-05-193-4/+24
* | | | Merge pull request #2379 from ethomson/status_win32Vicent Marti2014-05-221-2/+3
|\ \ \ \
| * | | | Include windows.h on win32 for SleepEdward Thomson2014-05-211-2/+3
|/ / / /
* | | | Merge pull request #2372 from libgit2/cmn/fetch-terminateVicent Marti2014-05-211-0/+12
|\ \ \ \ | |_|/ / |/| | |
| * | | smart: send a flush when we disconnectcmn/fetch-terminateCarlos Martín Nieto2014-05-201-0/+12
| |/ /
* | | Merge pull request #2373 from kitbellew/fix-clone-into-mirrorCarlos Martín Nieto2014-05-211-4/+2
|\ \ \
| * | | Minor fix for cmn/clone-into-mirror.Albert Meltzer2014-05-201-4/+2
|/ / /
* | | Fix a leak in the testsCarlos Martín Nieto2014-05-201-1/+1
|/ /
* | Merge pull request #2371 from martinwoodward/attrib_fnmatchVicent Marti2014-05-192-3/+58
|\ \
| * | Restore attributions for fnmatchMartin Woodward2014-05-192-3/+58
* | | Merge pull request #2354 from libgit2/cmn/clone-into-mirrorVicent Marti2014-05-193-15/+75
|\ \ \ | |/ / |/| |
| * | clone: don't error out if the branch already existscmn/clone-into-mirrorCarlos Martín Nieto2014-05-191-0/+4
| * | clone: duplicate the remoteCarlos Martín Nieto2014-05-191-15/+12
| * | clone: add failing test for a mirror-clone with clone_intoCarlos Martín Nieto2014-05-192-0/+59
* | | Merge pull request #2364 from libgit2/cmn/comment-charVicent Marti2014-05-194-13/+15
|\ \ \
| * | | message: don't assume the comment charcmn/comment-charCarlos Martín Nieto2014-05-184-13/+15
* | | | Merge pull request #2303 from jacquesg/mingw-lseekVicent Marti2014-05-193-2/+3
|\ \ \ \
| * | | | git_pool_mallocsz takes an unsigned longJacques Germishuys2014-05-011-1/+1
| * | | | _InterlockedExchange expects a volatile LONGJacques Germishuys2014-05-011-1/+1
| * | | | Undef lseek firstJacques Germishuys2014-05-011-0/+1
* | | | | Merge pull request #2365 from kitbellew/fix-indexer-mmapPhilip Kelley2014-05-181-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix warning on uninitialized variable.Albert Meltzer2014-05-181-1/+1
|/ / / /
* | | | Fix a bug in the pack::packbuilder suitePhilip Kelley2014-05-171-0/+2
* | | | Fix printf format string from previous commitPhilip Kelley2014-05-171-1/+1
* | | | print_binary_hunk: Treat types with respectPhilip Kelley2014-05-171-7/+24
* | | | Merge remote-tracking branch 'upstream/cmn/indexer-mmap' into developmentPhilip Kelley2014-05-178-73/+111
|\ \ \ \
| * | | | indexer: mmap fixes for Windowscmn/indexer-mmapCarlos Martín Nieto2014-05-174-3/+11
| * | | | indexer: use mmap for writingCarlos Martín Nieto2014-05-176-72/+102
* | | | | Merge pull request #2362 from libgit2/rb/update-4k-to-8kVicent Marti2014-05-174-2/+125
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Git binary check compat testsrb/update-4k-to-8kRussell Belfer2014-05-161-0/+114