summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bc/hash-independent-tests-part-6'Junio C Hamano2019-11-101-0/+11
|\
| * rev-parse: add a --show-object-format optionbrian m. carlson2019-10-281-0/+11
* | Merge branch 'js/update-index-ignore-removal-for-skip-worktree'Junio C Hamano2019-11-102-3/+8
|\ \
| * | stash: handle staged changes in skip-worktree files correctlyJohannes Schindelin2019-11-021-2/+3
| * | update-index: optionally leave skip-worktree entries aloneJohannes Schindelin2019-11-021-1/+5
* | | Merge branch 'sg/commit-graph-usage-fix'Junio C Hamano2019-11-101-1/+0
|\ \ \
| * | | builtin/commit-graph.c: remove subcommand-less usage stringSZEDER Gábor2019-10-281-1/+0
| |/ /
* | | Merge branch 'wb/midx-progress'Junio C Hamano2019-11-102-6/+14
|\ \ \
| * | | multi-pack-index: add [--[no-]progress] option.William Baker2019-10-231-5/+13
| * | | midx: add MIDX_PROGRESS flagWilliam Baker2019-10-232-5/+5
* | | | Merge branch 'js/rebase-deprecate-preserve-merges'Junio C Hamano2019-11-101-3/+4
|\ \ \ \
| * | | | rebase: hide --preserve-merges optionDenton Liu2019-10-211-3/+4
* | | | | Merge branch 'hv/bitshift-constants-in-blame'Junio C Hamano2019-11-101-12/+12
|\ \ \ \ \
| * | | | | builtin/blame.c: constants into bit shift formatHariom Verma2019-10-211-12/+12
| | |_|/ / | |/| | |
* | | | | Merge branch 'dd/notes-copy-default-dst-to-head'Junio C Hamano2019-11-101-1/+1
|\ \ \ \ \
| * | | | | notes: fix minimum number of parameters to "copy" subcommandDoan Tran Cong Danh2019-10-181-1/+1
* | | | | | Merge branch 'pw/post-commit-from-sequencer'Junio C Hamano2019-11-101-22/+0
|\ \ \ \ \ \
| * | | | | | move run_commit_hook() to libgit and use it therePhillip Wood2019-10-161-22/+0
* | | | | | | Merge branch 'dl/format-patch-cover-from-desc'Junio C Hamano2019-11-101-33/+92
|\ \ \ \ \ \ \
| * | | | | | | format-patch: teach --cover-from-description optionDenton Liu2019-10-161-20/+75
| * | | | | | | format-patch: use enum variablesDenton Liu2019-10-161-13/+17
| * | | | | | | format-patch: replace erroneous and conditionDenton Liu2019-10-161-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor'Junio C Hamano2019-11-101-0/+7
|\ \ \ \ \ \ \
| * | | | | | | fetch-pack: write fetched refs to .promisorJonathan Tan2019-10-161-0/+7
* | | | | | | | 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