summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* cmake: let USE_ICONV be optional on macOSethomson/iconvEdward Thomson2017-11-111-1/+1
* cmake: Allow user to select bundled zlibHenry Kleynhans2017-11-111-12/+16
* Merge pull request #4308 from pks-t/pks/header-state-machineEdward Thomson2017-11-111-46/+82
|\
| * patch_parse: fix parsing patches only containing exact renamesPatrick Steinhardt2017-09-011-0/+1
| * patch_parse: implement state machine for parsing patch headersPatrick Steinhardt2017-08-251-46/+81
* | Merge pull request #4283 from tiennou/generic-tlsPatrick Steinhardt2017-11-0917-78/+137
|\ \
| * | cmake: move Darwin-specific block aroundEtienne Samson2017-10-231-9/+12
| * | cmake: Add USE_HTTPS as a CMake optionEtienne Samson2017-10-231-25/+55
| * | cmake: use FeatureSummary to display which features we end up usingEtienne Samson2017-10-231-0/+16
| * | cmake: make our macOS helpers more CMake-yEtienne Samson2017-10-231-14/+8
| * | https: correct some error messagesEtienne Samson2017-10-231-2/+2
| * | https: Prevent OpenSSL from namespace-leakingEtienne Samson2017-10-234-10/+23
| * | stream: Gather streams to src/streamsEtienne Samson2017-10-2315-28/+31
* | | Merge pull request #4386 from novalis/gitignore-ignore-spaceCarlos Martín Nieto2017-11-041-0/+10
|\ \ \
| * | | Ignore trailing whitespace in .gitignore files (as git itself does)David Turner2017-10-291-0/+10
| |/ /
* | | Merge remote-tracking branch 'upstream/master' into pks/conditional-includesCarlos Martín Nieto2017-11-046-117/+578
|\ \ \
| * | | config: check for OOM when writingcmn/config-write-preserve-caseCarlos Martín Nieto2017-10-301-0/+2
| * | | config: preserve the original case when writing out new sections and varsCarlos Martín Nieto2017-10-301-9/+18
| * | | Merge pull request #3944 from mhagger/diff-indent-heuristicCarlos Martín Nieto2017-10-292-78/+523
| |\ \ \
| | * \ \ Merge remote-tracking branch 'upstream/master' into diff-indent-heuristicCarlos Martín Nieto2017-10-29264-2840/+8990
| | |\ \ \
| | * | | | Introduce a new `XDL_INLINE` macro and use it instead of `inline`Michael Haggerty2017-10-141-3/+8
| | * | | | xdiff: rename "struct group" to "struct xdlgroup"Jeff King2016-10-031-7/+7
| | * | | | diff: improve positioning of add/delete blocks in diffsMichael Haggerty2016-09-292-0/+327
| | * | | | xdl_change_compact(): introduce the concept of a change groupMichael Haggerty2016-09-291-78/+185
| | * | | | recs_match(): take two xrecord_t pointers as argumentsMichael Haggerty2016-09-291-6/+6
| | * | | | xdiff: add recs_match helper functionJacob Keller2016-09-291-4/+10
| * | | | | transports: ssh: ask for credentials again when passphrase is wrongCurtis Vogt2017-10-201-2/+4
| | |_|/ / | |/| | |
| * | | | cmake: use project-relative binary and source directoriesPatrick Steinhardt2017-10-201-21/+21
| * | | | Merge pull request #4372 from pks-t/pks/xcode-linkingEdward Thomson2017-10-091-1/+4
| |\ \ \ \
| | * | | | cmake: fix linking in Xcode with object libraries onlyPatrick Steinhardt2017-10-091-1/+4
| * | | | | Merge pull request #4368 from pks-t/pks/smart-negotiate-revwalk-memleakEdward Thomson2017-10-091-6/+6
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | transports: smart: fix memory leak when skipping symbolic refsPatrick Steinhardt2017-10-091-6/+6
* | | | | | config: keep the output parameter at the start of the functionCarlos Martín Nieto2017-11-041-5/+6
* | | | | | config_file: implement "gitdir/i" conditionalPatrick Steinhardt2017-10-091-4/+25
* | | | | | config_file: implement conditional "gitdir" includesPatrick Steinhardt2017-10-091-0/+85
* | | | | | config_file: make repo and config path accessible to readerPatrick Steinhardt2017-10-091-5/+14
* | | | | | config_file: extract function to parse include pathPatrick Steinhardt2017-10-091-27/+35
* | | | | | config: pass repository when opening config filesPatrick Steinhardt2017-10-095-21/+26
* | | | | | repository: constify several repo parameters for gettersPatrick Steinhardt2017-10-091-6/+6
* | | | | | path: expose `git_path_is_dirsep`Patrick Steinhardt2017-10-092-3/+7
* | | | | | path: expose `git_path_is_absolute`Patrick Steinhardt2017-10-092-7/+11
|/ / / / /
* | | | | Merge pull request #4369 from libgit2/ethomson/checkout_typechangePatrick Steinhardt2017-10-091-1/+18
|\ \ \ \ \
| * | | | | checkout: do not test file mode on WindowsEdward Thomson2017-10-071-0/+8
| * | | | | checkout: treat files as modified if mode differsEdward Thomson2017-10-061-1/+10
* | | | | | Merge pull request #4359 from libgit2/cmn/proxy-options-freeEdward Thomson2017-10-073-0/+10
|\ \ \ \ \ \
| * | | | | | proxy: rename the options freeing functioncmn/proxy-options-freeCarlos Martín Nieto2017-10-073-4/+4
| * | | | | | curl: free the user-provided proxy credentialsCarlos Martín Nieto2017-09-271-0/+1
| * | | | | | curl: free the proxy optionsCarlos Martín Nieto2017-09-271-0/+2
| * | | | | | proxy: add a free function for the options's pointersCarlos Martín Nieto2017-09-272-0/+7
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #4367 from pks-t/pks/peel-peeled-to-tagEdward Thomson2017-10-071-1/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
View Lorry Controller Status