summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* github: update issue templateethomson/templateEdward Thomson2018-04-181-4/+9
* Merge pull request #4476 from pks-t/pks/backport-scriptEdward Thomson2018-04-171-0/+23
|\
| * scripts: add backporting scriptPatrick Steinhardt2018-01-121-0/+23
* | Merge pull request #4524 from pks-t/pks/worktree-refsEdward Thomson2018-04-173-8/+56
|\ \
| * | worktree: add ability to create worktree with pre-existing branchPatrick Steinhardt2018-02-093-8/+56
* | | Merge pull request #4618 from tiennou/fix/pwned-referencesEdward Thomson2018-04-174-0/+10
|\ \ \
| * | | tests: ensure worktrees' head have owners tooEtienne Samson2018-04-101-0/+1
| * | | refs: preserve the owning refdb when duping referenceEtienne Samson2018-04-103-0/+9
* | | | crlf: update CHANGELOGEdward Thomson2018-04-171-1/+2
* | | | crlf: wrap lineEdward Thomson2018-04-171-2/+4
* | | | tests: add information about the crlf data generatorEdward Thomson2018-04-172-0/+14
* | | | crlf: update checkout logic to reflect Git 2.9+ behaviourSven Strickroth2018-04-172-3/+9
* | | | tests: crlf: update POSIX test data to reflect Git 2.9+ behaviorSven Strickroth2018-04-1731-70/+70
* | | | tests: crlf: update Windows test data to reflect Git 2.9+ behaviorSven Strickroth2018-04-1735-80/+80
* | | | Merge pull request #4522 from csware/submodules-should-report-parse-errorsEdward Thomson2018-04-172-18/+43
|\ \ \ \
| * | | | Submodule API should report .gitmodules parse errorsSven Strickroth2018-03-272-18/+43
* | | | | Merge pull request #4514 from tiennou/fix/pkt-type-enumEdward Thomson2018-04-172-36/+35
|\ \ \ \ \
| * | | | | smart: typoEtienne Samson2018-04-111-1/+1
| * | | | | smart: free the pkt when we fail to store itEtienne Samson2018-04-111-4/+5
| * | | | | smart: separate error handling from pkt handlingEtienne Samson2018-04-111-7/+6
| * | | | | smart: make out arguments explicit on recv_pktEtienne Samson2018-04-111-5/+5
| * | | | | smart: typedef git_pkt_type and clarify recv_pkt return typeEtienne Samson2018-04-112-30/+29
| | |/ / / | |/| | |
* | | | | Merge pull request #4556 from libgit2/ethomson/proxy_pass_in_envEdward Thomson2018-04-161-0/+36
|\ \ \ \ \
| * | | | | online::clone: validate user:pass in HTTP_PROXYethomson/proxy_pass_in_envEdward Thomson2018-02-281-0/+36
* | | | | | Merge pull request #4596 from pks-t/pks/ssh-disconnectEdward Thomson2018-04-161-1/+2
|\ \ \ \ \ \
| * | | | | | transports: ssh: replace deprecated function `libssh2_session_startup`Patrick Steinhardt2018-03-271-1/+1
| * | | | | | transports: ssh: disconnect session before freeing itPatrick Steinhardt2018-03-271-0/+1
* | | | | | | Merge pull request #4622 from pks-t/pks/revwalk-hide-newer-parentsEdward Thomson2018-04-1610-24/+53
|\ \ \ \ \ \ \
| * | | | | | | revwalk: fix uninteresting revs sometimes not limiting graphwalkPatrick Steinhardt2018-04-1210-24/+53
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #4614 from pks-t/pks/gitignore-trailing-spacesEdward Thomson2018-04-163-10/+21
|\ \ \ \ \ \ \
| * | | | | | | attr_file: fix handling of directory patterns with trailing spacesPatrick Steinhardt2018-04-123-10/+21
| |/ / / / / /
* | | | | | | Merge pull request #4613 from pks-t/pks/local-fetch-symrefsPatrick Steinhardt2018-04-122-1/+28
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | transports: local: fix assert when fetching into repo with symrefsPatrick Steinhardt2018-04-062-1/+28
|/ / / / / /
* | | | | | Merge pull request #4597 from cjhoward92/fix/cert-check-docsPatrick Steinhardt2018-04-062-4/+4
|\ \ \ \ \ \
| * | | | | | remote/proxy: fix git_transport_certificate_check_db commentCarson Howard2018-03-272-4/+4
* | | | | | | Merge pull request #4587 from rcjsuen/patch-2Patrick Steinhardt2018-04-061-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Flag options in describe.h as being optionalRemy Suen2018-03-271-3/+3
| |/ / / / / /
* | | | | | | Merge pull request #4611 from erikvanzijst/erik/status_charPatrick Steinhardt2018-04-063-1/+28
|\ \ \ \ \ \ \
| * | | | | | | typo: Fixed a trivial typo in test function.Erik van Zijst2018-04-051-1/+1
| * | | | | | | diff: Add missing GIT_DELTA_TYPECHANGE -> 'T' mapping.Erik van Zijst2018-04-052-0/+27
* | | | | | | | Merge pull request #4609 from pks-t/pks/appveyor-kxe-typoPatrick Steinhardt2018-04-061-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | appveyor: fix typo in registry key to disable DHEPatrick Steinhardt2018-04-031-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #4607 from Sp1l/private/fix-libressl-2.7Patrick Steinhardt2018-04-032-2/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix build with LibreSSL 2.7Bernard Spil2018-04-022-2/+4
* | | | | | | | Merge pull request #4603 from pks-t/pks/appveyor-winhttp-workaroundPatrick Steinhardt2018-04-032-0/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | appveyor: disable DHE to avoid spurious failuresPatrick Steinhardt2018-03-291-0/+5
| * | | | | | | | util: fix missing headers for MinGW environmentsPatrick Steinhardt2018-03-291-0/+5
* | | | | | | | | Merge pull request #4601 from bgermann/masterPatrick Steinhardt2018-04-031-23/+67
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | sha1dc: update to fix errors with endianessbgermann2018-03-281-23/+67
| |/ / / / / / /
* | | | | | | | Merge pull request #4378 from cjhoward92/fix/submodule-add-check-indexPatrick Steinhardt2018-03-302-0/+109
|\ \ \ \ \ \ \ \