summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* fetch: delay fetch_if_missing=0 until after configJonathan Tan2019-10-241-2/+2
* Merge branch 'cb/pcre2-chartables-leakfix'Junio C Hamano2019-10-231-0/+1
|\
| * grep: make PCRE2 aware of custom allocatorCarlo Marcelo Arenas Belón2019-10-181-0/+1
* | Merge branch 'jj/stash-reset-only-toplevel'Junio C Hamano2019-10-181-1/+1
|\ \
| * | stash: avoid recursive hard reset on submodulesJakob Jarmar2019-10-151-1/+1
* | | Merge branch 'bw/format-patch-o-create-leading-dirs'Junio C Hamano2019-10-181-0/+16
|\ \ \
| * | | format-patch: create leading components of output directoryBert Wesarg2019-10-121-0/+16
| |/ /
* | | Merge branch 'js/trace2-fetch-push'Junio C Hamano2019-10-152-7/+17
|\ \ \
| * | | push: add trace2 instrumentationJosh Steadmon2019-10-031-0/+2
| * | | fetch: add trace2 instrumentationJosh Steadmon2019-10-031-7/+15
* | | | Merge branch 'ew/hashmap'Junio C Hamano2019-10-154-52/+72
|\ \ \ \
| * | | | hashmap_entry: remove first member requirement from docsEric Wong2019-10-071-1/+1
| * | | | hashmap: remove type arg from hashmap_{get,put,remove}_entryEric Wong2019-10-072-2/+2
| * | | | OFFSETOF_VAR macro to simplify hashmap iteratorsEric Wong2019-10-072-3/+3
| * | | | hashmap: introduce hashmap_free_entriesEric Wong2019-10-071-3/+3
| * | | | hashmap: use *_entry APIs for iterationEric Wong2019-10-072-6/+6
| * | | | hashmap_cmp_fn takes hashmap_entry paramsEric Wong2019-10-074-22/+37
| * | | | hashmap_get{,_from_hash} return "struct hashmap_entry *"Eric Wong2019-10-074-7/+11
| * | | | hashmap_put takes "struct hashmap_entry *"Eric Wong2019-10-071-1/+1
| * | | | hashmap_get takes "const struct hashmap_entry *"Eric Wong2019-10-072-3/+4
| * | | | hashmap_add takes "struct hashmap_entry *"Eric Wong2019-10-073-5/+5
| * | | | hashmap_entry_init takes "struct hashmap_entry *"Eric Wong2019-10-074-6/+6
* | | | | Merge branch 'en/fast-imexport-nested-tags'Junio C Hamano2019-10-151-17/+50
|\ \ \ \ \
| * | | | | fast-export: handle nested tagsElijah Newren2019-10-041-12/+18
| * | | | | fast-export: allow user to request tags be marked with --mark-tagsElijah Newren2019-10-041-0/+7
| * | | | | fast-export: add support for --import-marks-if-existsElijah Newren2019-10-041-4/+19
| * | | | | fast-export: fix exporting a tag and nothing elseElijah Newren2019-09-281-1/+6
* | | | | | Merge branch 'js/azure-pipelines-msvc'Junio C Hamano2019-10-151-2/+2
|\ \ \ \ \ \
| * | | | | | push: do not pretend to return `int` from `die_push_simple()`Johannes Schindelin2019-10-041-2/+2
* | | | | | | Merge branch 'gs/commit-graph-trace-with-cmd'Junio C Hamano2019-10-151-0/+6
|\ \ \ \ \ \ \
| * | | | | | | commit-graph: emit trace2 cmd_mode for each sub-commandGarima Singh2019-10-021-0/+6
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'js/fetch-jobs'Junio C Hamano2019-10-151-17/+107
|\ \ \ \ \ \ \
| * | | | | | | fetch: let --jobs=<n> parallelize --multiple, tooJohannes Schindelin2019-10-061-17/+107
* | | | | | | | Merge branch 'en/merge-recursive-cleanup'Junio C Hamano2019-10-154-5/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | cache-tree: share code between functions writing an index as a treeElijah Newren2019-08-191-1/+1
| * | | | | | | | merge-recursive: remove useless parameter in merge_trees()Elijah Newren2019-08-191-3/+1
| * | | | | | | | Ensure index matches head before invoking merge machinery, round NElijah Newren2019-08-192-0/+6
| * | | | | | | | merge-recursive: introduce an enum for detect_directory_renames valuesDerrick Stolee2019-08-191-1/+1
| * | | | | | | | checkout: provide better conflict hunk description with detached HEADElijah Newren2019-08-161-0/+8
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'js/stash-apply-in-secondary-worktree'Junio C Hamano2019-10-111-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | stash apply: report status correctly even in a worktree's subdirectoryJohannes Schindelin2019-10-061-0/+4
| |/ / / / / / /
* | | | | | | | Merge branch 'rs/dedup-includes'Junio C Hamano2019-10-116-6/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | treewide: remove duplicate #include directivesRené Scharfe2019-10-046-6/+0
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'bc/object-id-part17'Junio C Hamano2019-10-1112-53/+56
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin/show-index: replace sha1_to_hexbrian m. carlson2019-08-191-1/+1
| * | | | | | | | builtin/receive-pack: replace sha1_to_hexbrian m. carlson2019-08-191-4/+4
| * | | | | | | | builtin/index-pack: replace sha1_to_hexbrian m. carlson2019-08-191-2/+2
| * | | | | | | | wt-status: convert struct wt_status to object_idbrian m. carlson2019-08-191-2/+2
| * | | | | | | | cache: remove null_sha1brian m. carlson2019-08-192-2/+2
| * | | | | | | | builtin/worktree: switch null_sha1 to null_oidbrian m. carlson2019-08-191-1/+1
View Lorry Controller Status