summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* repository: distinguish sequencer cherry-pick and revertcmn/repository-state-sequencerCarlos Martín Nieto2015-11-204-3/+35
* Merge pull request #3511 from ethomson/racy_fixes_2Carlos Martín Nieto2015-11-173-53/+286
|\
| * racy: make git_index_read_index handle racinessEdward Thomson2015-11-162-30/+96
| * racy: ensure git_index_read_tree clears uptodateEdward Thomson2015-11-161-0/+28
| * index: clear uptodate bit on saveEdward Thomson2015-11-161-1/+16
| * index: test for smudged entries on write onlyEdward Thomson2015-11-161-7/+35
| * checkout::crlf test: don't crash when no idx entryEdward Thomson2015-11-161-4/+5
| * index: don't detect raciness in uptodate entriesEdward Thomson2015-11-162-2/+84
| * racy-git: do a single index->workdir diffEdward Thomson2015-11-161-10/+23
* | Merge pull request #3512 from ethomson/windows_sysdirCarlos Martín Nieto2015-11-174-16/+37
|\ \ | |/ |/|
| * tests: use out-of-the-way config dir in sandboxEdward Thomson2015-11-171-5/+12
| * tests: set PROGRAMDATA directory for running testsEdward Thomson2015-11-171-0/+2
| * config::global: use PROGRAMDATA configurationEdward Thomson2015-11-171-4/+6
| * settings: allow users to set PROGRAMDATAEdward Thomson2015-11-162-8/+18
|/
* Merge pull request #3506 from libgit2/vmg/pool-alignCarlos Martín Nieto2015-11-132-10/+18
|\
| * pool: Never return unaligned buffersvmg/pool-alignVicent Marti2015-11-132-10/+18
|/
* Merge pull request #3170 from CmdrMoozy/nsec_fixCarlos Martín Nieto2015-11-1216-50/+175
|\
| * diff: refactor complex timestamp check into its own functionAxel Rasmussen2015-10-011-5/+27
| * index: don't populate nsec values if GIT_USE_NSEC is offAxel Rasmussen2015-10-011-0/+3
| * Merge branch 'master' into nsec_fix_nextAxel Rasmussen2015-10-0157-84/+488
| |\
| * | apple: work around non-POSIX struct stat on OS X.Axel Rasmussen2015-09-181-6/+17
| * | diff/index: respect USE_NSEC for racily clean file detectionAxel Rasmussen2015-09-186-26/+43
| * | win32: define our own POSIX struct stat, and support USE_NSECAxel Rasmussen2015-09-186-18/+58
| * | cmake: fix CMake code organization problemAxel Rasmussen2015-09-181-6/+6
| * | cmake: Only provide USE_NSEC if struct stat members are avilable.Axel Rasmussen2015-09-183-5/+9
| * | caps: add test for GIT_FEATURES_NSECAxel Rasmussen2015-09-181-0/+6
| * | settings: expose GIT_USE_NSEC flag in git_libgit2_featuresAxel Rasmussen2015-09-182-2/+6
| * | cmake: add USE_NSEC, and only check nanosec m/ctime if enabledAxel Rasmussen2015-09-184-3/+21
* | | Merge pull request #3499 from ethomson/ref_dir_errmsgsCarlos Martín Nieto2015-11-125-5/+118
|\ \ \
| * | | reflog: error when a directory is at reflog pathEdward Thomson2015-11-122-4/+64
| * | | refs: complain when a directory exists at refEdward Thomson2015-11-122-1/+21
| * | | filebuf: detect directories in our wayEdward Thomson2015-11-032-0/+15
| * | | reflog: test reflog is deleted when ref is deletedEdward Thomson2015-11-031-0/+18
* | | | Merge pull request #3448 from libgit2/cmn/custom-agentCarlos Martín Nieto2015-11-128-3/+86
|\ \ \ \
| * | | | CHANGELOG: add note about custom user-agentCarlos Martín Nieto2015-11-121-0/+3
| * | | | winhttp: use a custom user-agent if the user has set itCarlos Martín Nieto2015-11-121-2/+34
| * | | | http: use a custom user-agent if the user has set itCarlos Martín Nieto2015-11-121-1/+12
| * | | | settings: add a setter for a custom user-agentCarlos Martín Nieto2015-11-125-0/+37
* | | | | Merge pull request #2534 from libgit2/ntk/case_index_conflictsEdward Thomson2015-11-123-6/+98
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | index: overwrite the path when inserting conflictsntk/case_index_conflictsCarlos Martín Nieto2015-11-122-5/+6
| * | | | index: correctly report which conflict stage has a wrong filemodeCarlos Martín Nieto2015-11-121-1/+1
| * | | | Failing test for case sensitive conflicts in the indexnulltoken2015-11-121-0/+91
|/ / / /
* | | | Merge pull request #3498 from ethomson/windows_symlinksCarlos Martín Nieto2015-11-083-0/+115
|\ \ \ \
| * | | | index: test that add_bypath preserves symlinksEdward Thomson2015-11-031-0/+29
| * | | | diff: on win32, treat fake "symlinks" speciallyEdward Thomson2015-11-031-0/+25
| * | | | diff: test "symlinks" in wd are respected on win32Edward Thomson2015-11-031-0/+61
| |/ / /
* | | | Merge pull request #3500 from ethomson/submodules_with_pathCarlos Martín Nieto2015-11-0816-24/+95
|\ \ \ \
| * | | | submodule: reload HEAD/index after reading configEdward Thomson2015-11-041-24/+18
| * | | | submodule: test updating a submodule w/ a pathEdward Thomson2015-11-0415-0/+77
* | | | | Merge pull request #3465 from libgit2/cmn/tls-registerEdward Thomson2015-11-045-0/+81
|\ \ \ \ \ | |/ / / / |/| | | |
View Lorry Controller Status