Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bc/hash-independent-tests-part-6' | Junio C Hamano | 2019-11-10 | 1 | -0/+11 |
|\ | |||||
| * | rev-parse: add a --show-object-format option | brian m. carlson | 2019-10-28 | 1 | -0/+11 |
* | | Merge branch 'js/update-index-ignore-removal-for-skip-worktree' | Junio C Hamano | 2019-11-10 | 2 | -3/+8 |
|\ \ | |||||
| * | | stash: handle staged changes in skip-worktree files correctly | Johannes Schindelin | 2019-11-02 | 1 | -2/+3 |
| * | | update-index: optionally leave skip-worktree entries alone | Johannes Schindelin | 2019-11-02 | 1 | -1/+5 |
* | | | Merge branch 'sg/commit-graph-usage-fix' | Junio C Hamano | 2019-11-10 | 1 | -1/+0 |
|\ \ \ | |||||
| * | | | builtin/commit-graph.c: remove subcommand-less usage string | SZEDER Gábor | 2019-10-28 | 1 | -1/+0 |
| |/ / | |||||
* | | | Merge branch 'wb/midx-progress' | Junio C Hamano | 2019-11-10 | 2 | -6/+14 |
|\ \ \ | |||||
| * | | | multi-pack-index: add [--[no-]progress] option. | William Baker | 2019-10-23 | 1 | -5/+13 |
| * | | | midx: add MIDX_PROGRESS flag | William Baker | 2019-10-23 | 2 | -5/+5 |
* | | | | Merge branch 'js/rebase-deprecate-preserve-merges' | Junio C Hamano | 2019-11-10 | 1 | -3/+4 |
|\ \ \ \ | |||||
| * | | | | rebase: hide --preserve-merges option | Denton Liu | 2019-10-21 | 1 | -3/+4 |
* | | | | | Merge branch 'hv/bitshift-constants-in-blame' | Junio C Hamano | 2019-11-10 | 1 | -12/+12 |
|\ \ \ \ \ | |||||
| * | | | | | builtin/blame.c: constants into bit shift format | Hariom Verma | 2019-10-21 | 1 | -12/+12 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'dd/notes-copy-default-dst-to-head' | Junio C Hamano | 2019-11-10 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | notes: fix minimum number of parameters to "copy" subcommand | Doan Tran Cong Danh | 2019-10-18 | 1 | -1/+1 |
* | | | | | | Merge branch 'pw/post-commit-from-sequencer' | Junio C Hamano | 2019-11-10 | 1 | -22/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | move run_commit_hook() to libgit and use it there | Phillip Wood | 2019-10-16 | 1 | -22/+0 |
* | | | | | | | Merge branch 'dl/format-patch-cover-from-desc' | Junio C Hamano | 2019-11-10 | 1 | -33/+92 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | format-patch: teach --cover-from-description option | Denton Liu | 2019-10-16 | 1 | -20/+75 |
| * | | | | | | | format-patch: use enum variables | Denton Liu | 2019-10-16 | 1 | -13/+17 |
| * | | | | | | | format-patch: replace erroneous and condition | Denton Liu | 2019-10-16 | 1 | -1/+1 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor' | Junio C Hamano | 2019-11-10 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fetch-pack: write fetched refs to .promisor | Jonathan Tan | 2019-10-16 | 1 | -0/+7 |
* | | | | | | | | fetch: delay fetch_if_missing=0 until after config | Jonathan Tan | 2019-10-24 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'cb/pcre2-chartables-leakfix' | Junio C Hamano | 2019-10-23 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | grep: make PCRE2 aware of custom allocator | Carlo Marcelo Arenas Belón | 2019-10-18 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'jj/stash-reset-only-toplevel' | Junio C Hamano | 2019-10-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | stash: avoid recursive hard reset on submodules | Jakob Jarmar | 2019-10-15 | 1 | -1/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'bw/format-patch-o-create-leading-dirs' | Junio C Hamano | 2019-10-18 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | format-patch: create leading components of output directory | Bert Wesarg | 2019-10-12 | 1 | -0/+16 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'js/trace2-fetch-push' | Junio C Hamano | 2019-10-15 | 2 | -7/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | push: add trace2 instrumentation | Josh Steadmon | 2019-10-03 | 1 | -0/+2 |
| * | | | | | | | fetch: add trace2 instrumentation | Josh Steadmon | 2019-10-03 | 1 | -7/+15 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'ew/hashmap' | Junio C Hamano | 2019-10-15 | 4 | -52/+72 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | hashmap_entry: remove first member requirement from docs | Eric Wong | 2019-10-07 | 1 | -1/+1 |
| * | | | | | | | hashmap: remove type arg from hashmap_{get,put,remove}_entry | Eric Wong | 2019-10-07 | 2 | -2/+2 |
| * | | | | | | | OFFSETOF_VAR macro to simplify hashmap iterators | Eric Wong | 2019-10-07 | 2 | -3/+3 |
| * | | | | | | | hashmap: introduce hashmap_free_entries | Eric Wong | 2019-10-07 | 1 | -3/+3 |
| * | | | | | | | hashmap: use *_entry APIs for iteration | Eric Wong | 2019-10-07 | 2 | -6/+6 |
| * | | | | | | | hashmap_cmp_fn takes hashmap_entry params | Eric Wong | 2019-10-07 | 4 | -22/+37 |
| * | | | | | | | hashmap_get{,_from_hash} return "struct hashmap_entry *" | Eric Wong | 2019-10-07 | 4 | -7/+11 |
| * | | | | | | | hashmap_put takes "struct hashmap_entry *" | Eric Wong | 2019-10-07 | 1 | -1/+1 |
| * | | | | | | | hashmap_get takes "const struct hashmap_entry *" | Eric Wong | 2019-10-07 | 2 | -3/+4 |
| * | | | | | | | hashmap_add takes "struct hashmap_entry *" | Eric Wong | 2019-10-07 | 3 | -5/+5 |
| * | | | | | | | hashmap_entry_init takes "struct hashmap_entry *" | Eric Wong | 2019-10-07 | 4 | -6/+6 |
* | | | | | | | | Merge branch 'en/fast-imexport-nested-tags' | Junio C Hamano | 2019-10-15 | 1 | -17/+50 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fast-export: handle nested tags | Elijah Newren | 2019-10-04 | 1 | -12/+18 |
| * | | | | | | | | fast-export: allow user to request tags be marked with --mark-tags | Elijah Newren | 2019-10-04 | 1 | -0/+7 |
| * | | | | | | | | fast-export: add support for --import-marks-if-exists | Elijah Newren | 2019-10-04 | 1 | -4/+19 |