summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* refdb: create references in commondirPatrick Steinhardt2017-03-172-2/+34
* worktree: write resolved paths into link filesPatrick Steinhardt2017-03-172-5/+12
* worktree: rename variable in `git_worktree_add`Patrick Steinhardt2017-03-171-13/+13
* worktree: use fully qualified reference name for created HEADPatrick Steinhardt2017-03-171-1/+1
* worktree: parent path should point to the working dirPatrick Steinhardt2017-03-173-5/+6
* worktree: implement `git_worktree_open_from_repository`Patrick Steinhardt2017-03-173-0/+71
* worktree: split off function opening working directoryPatrick Steinhardt2017-03-171-17/+38
* worktree: have `is_worktree_dir` accept a string instead of bufferPatrick Steinhardt2017-03-171-7/+16
* tests: worktree: use joinpath instead of printf to join pathsPatrick Steinhardt2017-03-151-1/+1
* tests: worktree: unify init/cleanup in open testsPatrick Steinhardt2017-03-151-26/+14
* tests: worktree: unify init/cleanup in submodule testsPatrick Steinhardt2017-03-151-39/+29
* tests: worktree: move submodule tests into own suitePatrick Steinhardt2017-03-152-65/+69
* Merge branch 'gumenikav/merge_driver_source_info'Patrick Steinhardt2017-03-151-0/+29
|\
| * merge_driver: add unresolved getters for git_merge_driver_sourceGumenik Alexandr2017-03-151-0/+29
* | Merge pull request #4146 from pks-t/pks/winhttp-errorsPatrick Steinhardt2017-03-141-1/+1
|\ \
| * | winhttp: disambiguate error messages when sending requestsPatrick Steinhardt2017-03-011-1/+1
* | | Merge pull request #4157 from adamniedzielski/4099-git-sort-time-uninterestingCarlos Martín Nieto2017-03-112-3/+26
|\ \ \
| * | | Skip uninteresting commits in revwalk timesort iteratorAdam Niedzielski2017-03-092-3/+26
* | | | Merge pull request #4156 from libgit2/ethomson/readbuffer_dont_hashCarlos Martín Nieto2017-03-111-15/+16
|\ \ \ \
| * | | | git_futils_readbuffer: don't compute sha-1ethomson/readbuffer_dont_hashEdward Thomson2017-03-091-15/+16
| |/ / /
* | | | Merge pull request #4151 from novalis/dturner/rebase-submodule-untrackedEdward Thomson2017-03-0934-1/+190
|\ \ \ \ | |/ / / |/| | |
| * | | rebase: ignore untracked files in submodulesDavid Turner2017-03-0334-1/+190
| | |/ | |/|
* | | Merge pull request #4154 from libgit2/ethomson/namespacesEdward Thomson2017-03-062-26/+71
|\ \ \ | |/ / |/| |
| * | refdb_fs: honor the namespaceethomson/namespacesEdward Thomson2017-03-061-26/+35
| * | refs::namespace: add namespace testsEdward Thomson2017-03-061-0/+36
|/ /
* | Merge pull request #4150 from libgit2/ethomson/freshen_treesCarlos Martín Nieto2017-03-034-19/+90
|\ \
| * | git_commit_create: freshen tree objects in commitethomson/freshen_treesEdward Thomson2017-03-034-19/+90
|/ /
* | Merge pull request #4136 from libgit2/ethomson/sha1dcCarlos Martín Nieto2017-03-0312-9/+1815
|\ \
| * | cmake: drop unset `SHA1_TYPE`ethomson/sha1dcEdward Thomson2017-03-031-2/+2
| * | hash: test for sha1 collision attack detectionEdward Thomson2017-03-033-0/+70
| * | hash: include sha1collisiondetectionEdward Thomson2017-03-039-3/+1739
| * | hash: rename implementation selection constantsEdward Thomson2017-03-032-6/+6
|/ /
* | Merge pull request #4148 from pks-t/pks/fix-haiku-buildsPatrick Steinhardt2017-03-011-1/+4
|\ \
| * | cmake: only enable supported compiler warning flagsPatrick Steinhardt2017-03-011-1/+4
|/ /
* | Merge pull request #4145 from pks-t/pks/refs-create-memleakPatrick Steinhardt2017-03-011-1/+1
|\ \ | |/ |/|
| * tests: refs::create: fix memory leakPatrick Steinhardt2017-03-011-1/+1
|/
* Merge pull request #4143 from richardipsum/issue-4094Patrick Steinhardt2017-03-012-2/+56
|\
| * Add test for inclusion of (merge) in reflogRichard Ipsum2017-02-281-1/+43
| * Fix: make reflog include "(merge)" for merge commitsRichard Ipsum2017-02-271-1/+13
* | Merge pull request #4138 from richardipsum/symbolic-create-arbitrary-tgt-testEdward Thomson2017-02-261-5/+54
|\ \
| * | Whitespace and style fixesRichard Ipsum2017-02-251-5/+5
| * | tests: Add create__symbolic_with_arbitrary_contentRichard Ipsum2017-02-251-0/+49
* | | Merge pull request #4142 from pblesi/patch-1Edward Thomson2017-02-261-2/+2
|\ \ \
| * | | Fix minor typos in CONVENTIONS.mdPatrick Blesi2017-02-251-2/+2
| | |/ | |/|
* | | Merge pull request #4141 from kainjow/patch-2Edward Thomson2017-02-261-2/+2
|\ \ \ | |/ / |/| |
| * | Fix inet_pton tests triggering an assert in HaikuKevin Wojniak2017-02-251-2/+2
|/ /
* | Merge pull request #4137 from libgit2/ethomson/appveyorEdward Thomson2017-02-252-2/+5
|\ \ | |/ |/|
| * appveyor: don't rewrite system mingwethomson/appveyorEdward Thomson2017-02-241-2/+4
| * appveyor: always build the 'appveyor' branchEdward Thomson2017-02-241-0/+1
|/
* Merge pull request #4133 from stinb/khash-cleanup-regressionPatrick Steinhardt2017-02-241-3/+3
|\
View Lorry Controller Status