aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* The sixth batchJunio C Hamano2019-07-191-0/+35
* Merge branch 'ma/ref-filter-leakfix'Junio C Hamano2019-07-191-5/+9
|\
| * ref-filter: fix memory leak in `free_array_item()`Martin Ågren2019-07-101-5/+9
* | Merge branch 'js/trace2-signo-typofix'Junio C Hamano2019-07-191-1/+1
|\ \
| * | trace2: correct trace2 field name documentationJosh Steadmon2019-07-091-1/+1
* | | Merge branch 'kb/mingw-set-home'Junio C Hamano2019-07-191-0/+24
|\ \ \
| * | | mingw: initialize HOME on startupKarsten Blees2019-07-081-0/+24
* | | | Merge branch 'ea/merge-code-cleanup'Junio C Hamano2019-07-191-33/+20
|\ \ \ \
| * | | | builtin/merge.c - cleanup of code in for-cycle that tests strategiesEdmundo Carmona Antoranz2019-07-091-33/+20
| |/ / /
* | | | Merge branch 'jl/status-reduce-vertical-blank'Junio C Hamano2019-07-194-85/+0
|\ \ \ \
| * | | | status: remove the empty line after hintsJohn Lin2019-06-214-85/+0
* | | | | Merge branch 'pw/rebase-progress-test-cleanup'Junio C Hamano2019-07-191-8/+11
|\ \ \ \ \
| * | | | | t3420: remove progress lines before comparing outputPhillip Wood2019-07-081-8/+11
* | | | | | Merge branch 'pw/prompt-cherry-pick-revert-fix'Junio C Hamano2019-07-192-6/+51
|\ \ \ \ \ \
| * | | | | | git-prompt: improve cherry-pick/revert detectionPhillip Wood2019-07-012-6/+51
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ew/repack-with-bitmaps-by-default'Junio C Hamano2019-07-192-2/+26
|\ \ \ \ \ \
| * | | | | | repack: disable bitmaps-by-default if .keep files existEric Wong2019-07-012-2/+26
* | | | | | | Merge branch 'jk/check-connected-with-alternates'Junio C Hamano2019-07-1910-100/+224
|\ \ \ \ \ \ \
| * | | | | | | check_everything_connected: assume alternate ref tips are validJeff King2019-07-015-0/+125
| * | | | | | | object-store.h: move for_each_alternate_ref() from transport.hJeff King2019-07-015-100/+99
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'nd/tree-walk-with-repo'Junio C Hamano2019-07-1926-98/+146
|\ \ \ \ \ \ \
| * | | | | | | t7814: do not generate same commits in different reposNguyễn Thái Ngọc Duy2019-06-281-1/+17
| * | | | | | | Use the right 'struct repository' instead of the_repositoryNguyễn Thái Ngọc Duy2019-06-274-22/+26
| * | | | | | | match-trees.c: remove the_repo from shift_tree*()Nguyễn Thái Ngọc Duy2019-06-274-10/+12
| * | | | | | | tree-walk.c: remove the_repo from get_tree_entry_follow_symlinks()Nguyễn Thái Ngọc Duy2019-06-273-14/+10
| * | | | | | | tree-walk.c: remove the_repo from get_tree_entry()Nguyễn Thái Ngọc Duy2019-06-2711-26/+38
| * | | | | | | tree-walk.c: remove the_repo from fill_tree_descriptor()Nguyễn Thái Ngọc Duy2019-06-279-21/+29
| * | | | | | | sha1-file.c: remove the_repo from read_object_with_reference()Nguyễn Thái Ngọc Duy2019-06-277-13/+23
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'ra/cherry-pick-revert-skip'Junio C Hamano2019-07-1911-26/+266
|\ \ \ \ \ \ \
| * | | | | | | cherry-pick/revert: advise using --skipRohit Ashiwal2019-07-023-8/+34
| * | | | | | | cherry-pick/revert: add --skip optionRohit Ashiwal2019-07-027-6/+187
| * | | | | | | sequencer: use argv_array in reset_mergeRohit Ashiwal2019-07-021-6/+11
| * | | | | | | sequencer: rename reset_for_rollback to reset_mergeRohit Ashiwal2019-07-021-3/+3
| * | | | | | | sequencer: add advice for revertRohit Ashiwal2019-07-024-6/+34
* | | | | | | | Merge branch 'tb/ref-filter-multiple-patterns'Junio C Hamano2019-07-192-26/+89
|\ \ \ \ \ \ \ \
| * | | | | | | | ref-filter.c: find disjoint pattern prefixesTaylor Blau2019-06-272-26/+89
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'pw/status-with-corrupt-sequencer-state'Junio C Hamano2019-07-192-22/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | status: do not report errors in sequencer/todoPhillip Wood2019-06-272-16/+24
| * | | | | | | | sequencer: factor out todo command name parsingPhillip Wood2019-06-271-6/+13
| * | | | | | | | sequencer: always allow tab after command namePhillip Wood2019-06-271-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ds/commit-graph-incremental'Junio C Hamano2019-07-1910-74/+1414
|\ \ \ \ \ \ \ \
| * | | | | | | | commit-graph: test verify across alternatesDerrick Stolee2019-06-191-0/+19
| * | | | | | | | commit-graph: normalize commit-graph filenamesDerrick Stolee2019-06-192-8/+29
| * | | | | | | | commit-graph: test --split across alternate without --splitDerrick Stolee2019-06-191-0/+15
| * | | | | | | | commit-graph: test octopus merges with --splitDerrick Stolee2019-06-191-0/+11
| * | | | | | | | commit-graph: clean up chains after flattened writeDerrick Stolee2019-06-192-3/+21
| * | | | | | | | commit-graph: verify chains with --shallow modeDerrick Stolee2019-06-195-14/+101
| * | | | | | | | commit-graph: create options for split filesDerrick Stolee2019-06-198-24/+128
| * | | | | | | | commit-graph: expire commit-graph filesDerrick Stolee2019-06-193-1/+85
| * | | | | | | | commit-graph: allow cross-alternate chainsDerrick Stolee2019-06-194-11/+123