summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Drop trailing whitespacesntk/reflog_branch_createnulltoken2015-03-041-1/+1
* branch: fix generated reflog message upon renamingnulltoken2015-03-042-2/+2
* branch: fix generated reflog message upon creationnulltoken2015-03-042-2/+2
* Merge pull request #2932 from jeffhostetler/jeffhostetler/big_clone_crashCarlos Martín Nieto2015-03-043-5/+69
|\
| * Change ifdef for MINGW32.Jeff Hostetler2015-03-031-4/+2
| * Fix p_ftruncate to handle big files for git_cloneJeff Hostetler2015-03-033-4/+70
* | Merge branch 'tls_data'Carlos Martín Nieto2015-03-042-10/+38
|\ \
| * | libgit2_shutdown: free TLS data (win32)Edward Thomson2015-03-041-0/+11
| * | libgit2_shutdown: clear err message on shutdownEdward Thomson2015-03-042-10/+27
| * | Fix leak of TLS error message in shutdown (ptherad version)Leo Yang2015-03-041-3/+3
|/ /
* | Merge pull request #2886 from jeffhostetler/jeffhostetler/clar_traceCarlos Martín Nieto2015-03-047-1/+325
|\ \
| * | Converted cl_perf_timer to use git__timer internally.Jeff Hostetler2015-03-032-76/+11
| * | Added cl_perf_timer. Updated global trace to include timers.Jeff Hostetler2015-03-024-2/+153
| * | Cleanup formatting of clar trace messages.Jeff Hostetler2015-03-021-7/+7
| * | Provide mechanism to let CLAR globally setup git_trace()Jeff Hostetler2015-03-025-1/+239
* | | Merge pull request #2945 from ethomson/empty_hashsig_heapCarlos Martín Nieto2015-03-042-1/+116
|\ \ \
| * | | diff_tform: account for whitespace optionsEdward Thomson2015-03-042-10/+84
| * | | diff_tform: don't compare empty hashsig_heapsEdward Thomson2015-03-032-0/+41
* | | | Plug a few leaksCarlos Martín Nieto2015-03-047-7/+19
* | | | Merge pull request #2941 from libgit2/cmn/http-enforce-credEdward Thomson2015-03-031-0/+5
|\ \ \ \
| * | | | http: enforce the credential typescmn/http-enforce-credCarlos Martín Nieto2015-03-031-0/+5
| |/ / /
* | | | Merge pull request #2771 from libgit2/cmn/config-borrow-entryEdward Thomson2015-03-0335-318/+446
|\ \ \ \ | |/ / / |/| | |
| * | | config: borrow refcounted referencescmn/config-borrow-entryCarlos Martín Nieto2015-03-0335-318/+446
|/ / /
* | | Remove swp filesCarlos Martín Nieto2015-03-032-0/+0
* | | Merge pull request #2934 from akikoskinen/mingw_build_fixEdward Thomson2015-03-032-7/+11
|\ \ \
| * | | Include ws2tcpip.h in order to get in6_addrAki Koskinen2015-03-021-0/+1
| * | | Include openssl headers lastAki Koskinen2015-03-021-4/+4
| * | | Don't include headers on windows that aren't availableAki Koskinen2015-03-021-3/+6
| |/ /
* | | Merge pull request #2913 from ethomson/stash_fixupEdward Thomson2015-03-032-2/+20
|\ \ \
| * | | stash: correctly stash wd modified/index deletedEdward Thomson2015-02-182-2/+20
* | | | Merge pull request #2808 from libgit2/cmn/repo-identEdward Thomson2015-03-0391-792/+712
|\ \ \ \
| * | | | Update CHANGELOG with the reflog ident changescmn/repo-identCarlos Martín Nieto2015-03-031-0/+19
| * | | | repository: remove log message override for switching the active branchCarlos Martín Nieto2015-03-0322-125/+141
| * | | | push: remove reflog message overrideCarlos Martín Nieto2015-03-036-23/+15
| * | | | branch: don't accept a reflog message overrideCarlos Martín Nieto2015-03-039-109/+58
| * | | | reset: remove reflog message overrideCarlos Martín Nieto2015-03-0314-102/+76
| * | | | Remove the signature from ref-modifying functionsCarlos Martín Nieto2015-03-0391-611/+581
* | | | | Merge pull request #2885 from JIghtuse/masterCarlos Martín Nieto2015-03-031-6/+24
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | describe example: function to add commits to optsBoris Egorov2015-02-061-6/+24
* | | | | Merge pull request #2908 from ethomson/safe_createCarlos Martín Nieto2015-03-0317-76/+132
|\ \ \ \ \
| * | | | | checkout tests: just use SAFE where appropriateEdward Thomson2015-02-272-9/+4
| * | | | | checkout: remove `GIT_CHECKOUT_SAFE_CREATE` as a strategyEdward Thomson2015-02-2711-73/+91
| * | | | | example: drop `SAFE_CREATE` from clone exampleEdward Thomson2015-02-271-1/+1
| * | | | | clone: drop now unnecessary SAFE_CREATEEdward Thomson2015-02-272-2/+2
| * | | | | checkout: upgrade to `SAFE_CREATE` when no index fileEdward Thomson2015-02-272-0/+43
| * | | | | merge perf test: drop unnecessary SAFE_CREATEEdward Thomson2015-02-271-1/+1
| * | | | | cherrypick, revert: drop unnecessary SAFE_CREATEEdward Thomson2015-02-272-2/+2
* | | | | | branch: do capture the error codeCarlos Martín Nieto2015-03-031-1/+1
* | | | | | Merge pull request #2937 from git-up/branch_delete_reflogCarlos Martín Nieto2015-03-031-1/+6
|\ \ \ \ \ \
| * | | | | | git_branch_delete() should ignore errors from non-existing reflogsPierre-Olivier Latour2015-03-021-1/+6
| | |_|_|/ / | |/| | | |