summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* remote: introduce `git_remote_connect_options`ethomson/remote_connect_optsEdward Thomson2022-01-0617-513/+609
* remote: improved error reportingEdward Thomson2022-01-063-8/+8
* push: don't try to connect in `finish`Edward Thomson2022-01-061-3/+4
* docs: document our API/ABI stability stanceEdward Thomson2022-01-061-0/+63
* Merge branch 'status'Edward Thomson2022-01-066-16/+79
|\
| * status: don't use `// ...` in tests, use `/* ... */`Edward Thomson2022-01-061-5/+4
| * Merge remote-tracking branch 'pr/6159'Edward Thomson2022-01-066-1/+65
| |\
| | * #6154 git_status_list_new case insensitive fixMiguel Arroz2022-01-016-1/+64
| * | status: don't use `// ...` in tests, use `/* ... */`Edward Thomson2022-01-061-15/+15
|/ /
* | Merge pull request #6165 from libgit2/ethomson/includeifEdward Thomson2022-01-062-3/+39
|\ \
| * | config: test allocation in config conditionalsethomson/includeifEdward Thomson2022-01-051-1/+3
| * | config: handle empty conditional in includeIfEdward Thomson2022-01-052-3/+37
| |/
* | Merge pull request #6158 from arroz/feat/statusRenameThresholdEdward Thomson2022-01-053-0/+72
|\ \
| * | Add `rename_threshold` to `git_status_options`.Miguel Arroz2021-12-313-0/+72
| |/
* | Merge pull request #6157 from boretrk/hmac_ctx_cleanupEdward Thomson2022-01-041-1/+1
|\ \ | |/ |/|
| * ntmlclient: don't declare dummy HMAC_CTX_cleanup when building with libresslPeter Pettersson2021-12-311-1/+1
|/
* Merge pull request #6150 from cestrand/patch-1Edward Thomson2021-12-241-2/+0
|\
| * Remove PSGit from Language Bindings section of READMEMarcin Kolenda2021-12-241-2/+0
|/
* Merge pull request #6148 from libgit2/ethomson/ciEdward Thomson2021-12-241-1/+2
|\
| * ci: build with ssh on nightlyEdward Thomson2021-12-231-1/+2
|/
* Merge pull request #6147 from libgit2/ethomson/insteadofEdward Thomson2021-12-231-34/+28
|\
| * remote: refactor insteadof applicationethomson/insteadofEdward Thomson2021-12-231-34/+28
|/
* Merge branch 'pr/6062'Edward Thomson2021-12-233-6/+34
|\
| * worktree: checkout options suggestions from code reviewEdward Thomson2021-12-233-8/+8
| * Fix test fail because of memory leakpunkymaniac2021-12-231-0/+1
| * Update test for `git_str` usage instead of `git_buf`punkymaniac2021-12-231-3/+3
| * Add test for `git_worktree_add` no checkoutpunkymaniac2021-12-231-0/+21
| * Change default checkout strategy from FORCE to SAFEpunkymaniac2021-12-231-2/+0
| * Allow user checkout options on git_worktree_addpunkymaniac2021-12-232-2/+10
|/
* Merge pull request #6142 from libgit2/ethomson/blob_data_is_binaryEdward Thomson2021-12-233-0/+37
|\
| * blob: identify binary contentethomson/blob_data_is_binaryEdward Thomson2021-12-103-0/+37
* | Merge pull request #6124 from csware/config-parsingEdward Thomson2021-12-234-5/+66
|\ \
| * | Multiline config values not preserved on savingSven Strickroth2021-12-062-4/+27
| * | Add more tests for contentsSven Strickroth2021-12-061-0/+15
| * | Config parsing confused by continuations that start with quotesSven Strickroth2021-12-063-1/+24
* | | Merge pull request #6125 from stforek/git_commit_summary_spacesEdward Thomson2021-12-232-4/+18
|\ \ \
| * | | git_commit_summary: ignore lines with spacesPrzemyslaw Ciezkowski2021-11-252-4/+18
| |/ /
* | | Merge pull request #6101 from mkhl/fix/instead-ofEdward Thomson2021-12-233-28/+153
|\ \ \
| * | | remote: improve apply_insteadof function signatureMartin Kühl2021-11-111-9/+9
| * | | fix remote/insteadof testsMartin Kühl2021-11-111-5/+25
| * | | update remote/insteadof testsMartin Kühl2021-11-112-23/+128
* | | | Merge pull request #6095 from yoichi/better-compatiblity-for-at-time-notationEdward Thomson2021-12-2312-32/+71
|\ \ \ \
| * \ \ \ Merge branch 'main' into better-compatiblity-for-at-time-notationYoichi Nakayama2021-11-23297-5385/+6264
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Add TODO comment for emit a warningYoichi Nakayama2021-10-221-0/+3
| * | | | Cause error when date parsing is failedYoichi Nakayama2021-10-224-3/+25
| * | | | Return the oldest reflog entry on revparse when older time is givenYoichi Nakayama2021-10-222-8/+19
| * | | | Add a branch with a empty reflog into testrepo.gitYoichi Nakayama2021-10-228-21/+24
* | | | | Merge pull request #6094 from visualgitio/commit-graph-long-longEdward Thomson2021-12-232-6/+6
|\ \ \ \ \
| * | | | | Simplifications to definitions to avoid UINT64_CCalvin Buckley2021-12-111-2/+2
| * | | | | Fix long long constants in macro in ntlmclientCalvin Buckley2021-10-181-4/+4