Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #4171 from rcjsuen/patch-1 | Patrick Steinhardt | 2017-03-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Fix typo in remote.h API | Remy Suen | 2017-03-20 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #4166 from pks-t/pks/map-free-fix | Edward Thomson | 2017-03-20 | 9 | -15/+9 | |
|\ \ \ \ \ | ||||||
| * | | | | | map: remove `*map_free` macros | Patrick Steinhardt | 2017-03-20 | 8 | -13/+8 | |
| * | | | | | checkout: fix double-free of checkout_data's mkdir_map | Patrick Steinhardt | 2017-03-20 | 1 | -2/+1 | |
* | | | | | | Merge pull request #4169 from csware/absolute-symlink | Patrick Steinhardt | 2017-03-20 | 2 | -1/+30 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | tests: filebuf: test writing to symlink with absolute paths | Patrick Steinhardt | 2017-03-20 | 1 | -0/+29 | |
| * | | | | | | filebuf: fix resolving absolute symlinks | Sven Strickroth2 | 2017-03-20 | 1 | -1/+1 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #4160 from pks-t/pks/diff-fixes | Patrick Steinhardt | 2017-03-20 | 5 | -82/+120 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | diff_parse: correctly set options for parsed diffs | Patrick Steinhardt | 2017-03-14 | 2 | -1/+24 | |
| * | | | | | | patch_parse: fix parsing minimal trailing diff line | Patrick Steinhardt | 2017-03-14 | 2 | -2/+24 | |
| * | | | | | | patch_generate: move `git_diff_foreach` to diff.c | Patrick Steinhardt | 2017-03-14 | 2 | -36/+35 | |
| * | | | | | | patch_generate: fix `git_diff_foreach` only working with generated diffs | Patrick Steinhardt | 2017-03-14 | 2 | -23/+38 | |
| * | | | | | | patch_generate: remove duplicated logic | Patrick Steinhardt | 2017-03-14 | 1 | -29/+8 | |
* | | | | | | | Merge pull request #4162 from pks-t/pks/merge-source-fixes | Patrick Steinhardt | 2017-03-20 | 2 | -10/+10 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | merge_driver: fix const-correctness for source getters | Patrick Steinhardt | 2017-03-15 | 2 | -10/+10 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge pull request #4161 from pks-t/pks/submodule-index-fix | Edward Thomson | 2017-03-15 | 1 | -1/+9 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | submodule: catch when submodule is not staged on update | Patrick Steinhardt | 2017-03-14 | 1 | -1/+9 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'gumenikav/merge_driver_source_info' | Patrick Steinhardt | 2017-03-15 | 1 | -0/+29 | |
|\ \ \ \ \ | ||||||
| * | | | | | merge_driver: add unresolved getters for git_merge_driver_source | Gumenik Alexandr | 2017-03-15 | 1 | -0/+29 | |
* | | | | | | Merge pull request #4146 from pks-t/pks/winhttp-errors | Patrick Steinhardt | 2017-03-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | winhttp: disambiguate error messages when sending requests | Patrick Steinhardt | 2017-03-01 | 1 | -1/+1 | |
* | | | | | | Merge pull request #4157 from adamniedzielski/4099-git-sort-time-uninteresting | Carlos Martín Nieto | 2017-03-11 | 2 | -3/+26 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Skip uninteresting commits in revwalk timesort iterator | Adam Niedzielski | 2017-03-09 | 2 | -3/+26 | |
* | | | | | | | Merge pull request #4156 from libgit2/ethomson/readbuffer_dont_hash | Carlos Martín Nieto | 2017-03-11 | 1 | -15/+16 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | git_futils_readbuffer: don't compute sha-1ethomson/readbuffer_dont_hash | Edward Thomson | 2017-03-09 | 1 | -15/+16 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #4151 from novalis/dturner/rebase-submodule-untracked | Edward Thomson | 2017-03-09 | 34 | -1/+190 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | rebase: ignore untracked files in submodules | David Turner | 2017-03-03 | 34 | -1/+190 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #4154 from libgit2/ethomson/namespaces | Edward Thomson | 2017-03-06 | 2 | -26/+71 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | refdb_fs: honor the namespaceethomson/namespaces | Edward Thomson | 2017-03-06 | 1 | -26/+35 | |
| * | | | | | refs::namespace: add namespace tests | Edward Thomson | 2017-03-06 | 1 | -0/+36 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #4150 from libgit2/ethomson/freshen_trees | Carlos Martín Nieto | 2017-03-03 | 4 | -19/+90 | |
|\ \ \ \ \ | ||||||
| * | | | | | git_commit_create: freshen tree objects in commitethomson/freshen_trees | Edward Thomson | 2017-03-03 | 4 | -19/+90 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #4136 from libgit2/ethomson/sha1dc | Carlos Martín Nieto | 2017-03-03 | 12 | -9/+1815 | |
|\ \ \ \ \ | ||||||
| * | | | | | cmake: drop unset `SHA1_TYPE`ethomson/sha1dc | Edward Thomson | 2017-03-03 | 1 | -2/+2 | |
| * | | | | | hash: test for sha1 collision attack detection | Edward Thomson | 2017-03-03 | 3 | -0/+70 | |
| * | | | | | hash: include sha1collisiondetection | Edward Thomson | 2017-03-03 | 9 | -3/+1739 | |
| * | | | | | hash: rename implementation selection constants | Edward Thomson | 2017-03-03 | 2 | -6/+6 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #4148 from pks-t/pks/fix-haiku-builds | Patrick Steinhardt | 2017-03-01 | 1 | -1/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | cmake: only enable supported compiler warning flags | Patrick Steinhardt | 2017-03-01 | 1 | -1/+4 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #4145 from pks-t/pks/refs-create-memleak | Patrick Steinhardt | 2017-03-01 | 1 | -1/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | tests: refs::create: fix memory leak | Patrick Steinhardt | 2017-03-01 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #4143 from richardipsum/issue-4094 | Patrick Steinhardt | 2017-03-01 | 2 | -2/+56 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Add test for inclusion of (merge) in reflog | Richard Ipsum | 2017-02-28 | 1 | -1/+43 | |
| * | | | Fix: make reflog include "(merge)" for merge commits | Richard Ipsum | 2017-02-27 | 1 | -1/+13 | |
| |/ / | ||||||
* | | | Merge pull request #4138 from richardipsum/symbolic-create-arbitrary-tgt-test | Edward Thomson | 2017-02-26 | 1 | -5/+54 | |
|\ \ \ | ||||||
| * | | | Whitespace and style fixes | Richard Ipsum | 2017-02-25 | 1 | -5/+5 | |
| * | | | tests: Add create__symbolic_with_arbitrary_content | Richard Ipsum | 2017-02-25 | 1 | -0/+49 | |
* | | | | Merge pull request #4142 from pblesi/patch-1 | Edward Thomson | 2017-02-26 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | Fix minor typos in CONVENTIONS.md | Patrick Blesi | 2017-02-25 | 1 | -2/+2 | |
| | |/ / | |/| | |