aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'en/merge-octopus-fix'Junio C Hamano2016-04-25
|\
| * merge-octopus: abort if index does not match HEADElijah Newren2016-04-12
| * t6044: new merge testcases for when index doesn't match HEADElijah Newren2016-04-12
* | Merge branch 'dt/pre-refs-backend'Junio C Hamano2016-04-25
|\ \
| * | refs: on symref reflog expire, lock symref not referrentDavid Turner2016-04-10
| * | refs: move resolve_ref_unsafe into common codeDavid Turner2016-04-10
| * | show_head_ref(): check the result of resolve_ref_namespace()Michael Haggerty2016-04-10
| * | check_aliased_update(): check that dst_name is non-NULLMichael Haggerty2016-04-10
| * | checkout_paths(): remove unneeded flag variableMichael Haggerty2016-04-10
| * | cmd_merge(): remove unneeded flag variableMichael Haggerty2016-04-10
| * | fsck_head_link(): remove unneeded flag variableMichael Haggerty2016-04-10
| * | read_raw_ref(): change flags parameter to unsigned intMichael Haggerty2016-04-10
| * | files-backend: inline resolve_ref_1() into resolve_ref_unsafe()Michael Haggerty2016-04-10
| * | read_raw_ref(): manage own scratch spaceMichael Haggerty2016-04-10
| * | files-backend: break out ref readingDavid Turner2016-04-10
| * | resolve_ref_1(): eliminate local variable "bad_name"Michael Haggerty2016-04-10
| * | resolve_ref_1(): reorder codeMichael Haggerty2016-04-10
| * | resolve_ref_1(): eliminate local variableMichael Haggerty2016-04-10
| * | resolve_ref_unsafe(): ensure flags is always setMichael Haggerty2016-04-10
| * | resolve_ref_unsafe(): use for loop to count up to MAXDEPTHMichael Haggerty2016-04-10
| * | resolve_missing_loose_ref(): simplify semanticsMichael Haggerty2016-04-10
| * | t1430: improve test coverage of deletion of badly-named refsMichael Haggerty2016-04-10
| * | t1430: test for-each-ref in the presence of badly-named refsMichael Haggerty2016-04-10
| * | t1430: don't rely on symbolic-ref for creating broken symrefsMichael Haggerty2016-04-10
| * | t1430: clean up broken refs/tags/shadowMichael Haggerty2016-04-10
| * | t1430: test the output and error of some commands more carefullyMichael Haggerty2016-04-10
| * | refs: move for_each_*ref* functions into common codeDavid Turner2016-04-10
| * | refs: move head_ref{,_submodule} to the common codeDavid Turner2016-04-10
* | | Merge branch 'jc/rerere-multi'Junio C Hamano2016-04-25
|\ \ \
| * | | rerere: adjust 'forget' to multi-variant world orderJunio C Hamano2016-04-06
| * | | rerere: split code to call ll_merge() furtherJunio C Hamano2016-04-06
| * | | rerere: move code related to "forget" togetherJunio C Hamano2016-04-06
| * | | rerere: gc and clearJunio C Hamano2016-04-06
| * | | rerere: do use multiple variantsJunio C Hamano2016-03-15
| * | | t4200: rerere a merge with two identical conflictsJunio C Hamano2016-03-15
| * | | rerere: allow multiple variants to existJunio C Hamano2016-03-15
| * | | rerere: delay the recording of preimageJunio C Hamano2016-03-15
| * | | rerere: handle leftover rr-cache/$ID directory and postimage filesJunio C Hamano2016-03-15
| * | | rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_idJunio C Hamano2016-02-08
| * | | rerere: split conflict ID furtherJunio C Hamano2016-02-08
* | | | Sixth batch for post 2.8 cycleJunio C Hamano2016-04-22
* | | | Merge branch 'ad/cygwin-wants-rename'Junio C Hamano2016-04-22
|\ \ \ \
| * | | | config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMESAdam Dinwoodie2015-08-07
* | | | | Merge branch 'jk/use-write-script-more'Junio C Hamano2016-04-22
|\ \ \ \ \
| * | | | | t3404: use write_scriptJunio C Hamano2016-04-12
| * | | | | t1020: do not overuse printf and use write_scriptJunio C Hamano2016-04-11
| * | | | | t5532: use write_scriptJeff King2016-04-10
* | | | | | Merge branch 'jk/do-not-printf-NULL'Junio C Hamano2016-04-22
|\ \ \ \ \ \
| * | | | | | git_config_set_multivar_in_file: handle "unset" errorsJeff King2016-04-10
| * | | | | | git_config_set_multivar_in_file: all non-zero returns are errorsJeff King2016-04-10
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-23 23:33:40 +0000