summaryrefslogtreecommitdiff
path: root/tests/merge/workdir/dirty.c
Commit message (Expand)AuthorAgeFilesLines
* win32: introduce p_timeval that isn't stupidEdward Thomson2016-02-121-1/+1
* merge tests: correct castsEdward Thomson2016-02-111-3/+3
* cmake: Only provide USE_NSEC if struct stat members are avilable.Axel Rasmussen2015-09-181-2/+1
* cmake: add USE_NSEC, and only check nanosec m/ctime if enabledAxel Rasmussen2015-09-181-1/+7
* merge: work around write-side racy protection when hacking the indexCarlos Martín Nieto2015-06-221-1/+14
* merge::workdir::dirty: tick idx to defeat racy-gitEdward Thomson2015-06-161-0/+12
* reset: remove reflog message overrideCarlos Martín Nieto2015-03-031-4/+4
* Remove the signature from ref-modifying functionsCarlos Martín Nieto2015-03-031-4/+4
* s/git_merge_head/git_annotated_commitEdward Thomson2014-10-261-4/+4
* Allow to propagate checkout callbacks to git HARD resetSven Strickroth2014-08-031-4/+4
* git_checkout_index: checkout other indexesEdward Thomson2014-07-011-1/+1
* merge: checkout default shouldn't clobber givenEdward Thomson2014-04-231-8/+7
* merge: default checkout strategy for should be SAFEEdward Thomson2014-04-231-0/+17
* Remove `git_merge_result` as it's now unnecessaryEdward Thomson2014-03-201-24/+7
* Update git_merge_tree_opts to git_merge_optionsEdward Thomson2014-03-201-1/+1
* Change signature of `git_merge` to take merge and checkout optsEdward Thomson2014-03-201-4/+5
* Fix a few references to changed function signaturesBen Straub2014-02-051-3/+3
* Test that emulates a strange filter implementationEdward Thomson2014-02-031-0/+70
* Tests merging staged files identical to resultEdward Thomson2014-02-031-0/+70
* Tests merge when changes exist in workdir/indexEdward Thomson2014-02-031-0/+182
View Lorry Controller Status