Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | The sixth batch | Junio C Hamano | 2019-07-19 | 1 | -0/+35 |
* | Merge branch 'ma/ref-filter-leakfix' | Junio C Hamano | 2019-07-19 | 1 | -5/+9 |
|\ | |||||
| * | ref-filter: fix memory leak in `free_array_item()` | Martin Ågren | 2019-07-10 | 1 | -5/+9 |
* | | Merge branch 'js/trace2-signo-typofix' | Junio C Hamano | 2019-07-19 | 1 | -1/+1 |
|\ \ | |||||
| * | | trace2: correct trace2 field name documentation | Josh Steadmon | 2019-07-09 | 1 | -1/+1 |
* | | | Merge branch 'kb/mingw-set-home' | Junio C Hamano | 2019-07-19 | 1 | -0/+24 |
|\ \ \ | |||||
| * | | | mingw: initialize HOME on startup | Karsten Blees | 2019-07-08 | 1 | -0/+24 |
* | | | | Merge branch 'ea/merge-code-cleanup' | Junio C Hamano | 2019-07-19 | 1 | -33/+20 |
|\ \ \ \ | |||||
| * | | | | builtin/merge.c - cleanup of code in for-cycle that tests strategies | Edmundo Carmona Antoranz | 2019-07-09 | 1 | -33/+20 |
| |/ / / | |||||
* | | | | Merge branch 'jl/status-reduce-vertical-blank' | Junio C Hamano | 2019-07-19 | 4 | -85/+0 |
|\ \ \ \ | |||||
| * | | | | status: remove the empty line after hints | John Lin | 2019-06-21 | 4 | -85/+0 |
* | | | | | Merge branch 'pw/rebase-progress-test-cleanup' | Junio C Hamano | 2019-07-19 | 1 | -8/+11 |
|\ \ \ \ \ | |||||
| * | | | | | t3420: remove progress lines before comparing output | Phillip Wood | 2019-07-08 | 1 | -8/+11 |
* | | | | | | Merge branch 'pw/prompt-cherry-pick-revert-fix' | Junio C Hamano | 2019-07-19 | 2 | -6/+51 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-prompt: improve cherry-pick/revert detection | Phillip Wood | 2019-07-01 | 2 | -6/+51 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'ew/repack-with-bitmaps-by-default' | Junio C Hamano | 2019-07-19 | 2 | -2/+26 |
|\ \ \ \ \ \ | |||||
| * | | | | | | repack: disable bitmaps-by-default if .keep files exist | Eric Wong | 2019-07-01 | 2 | -2/+26 |
* | | | | | | | Merge branch 'jk/check-connected-with-alternates' | Junio C Hamano | 2019-07-19 | 10 | -100/+224 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | check_everything_connected: assume alternate ref tips are valid | Jeff King | 2019-07-01 | 5 | -0/+125 |
| * | | | | | | | object-store.h: move for_each_alternate_ref() from transport.h | Jeff King | 2019-07-01 | 5 | -100/+99 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'nd/tree-walk-with-repo' | Junio C Hamano | 2019-07-19 | 26 | -98/+146 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t7814: do not generate same commits in different repos | Nguyễn Thái Ngọc Duy | 2019-06-28 | 1 | -1/+17 |
| * | | | | | | | Use the right 'struct repository' instead of the_repository | Nguyễn Thái Ngọc Duy | 2019-06-27 | 4 | -22/+26 |
| * | | | | | | | match-trees.c: remove the_repo from shift_tree*() | Nguyễn Thái Ngọc Duy | 2019-06-27 | 4 | -10/+12 |
| * | | | | | | | tree-walk.c: remove the_repo from get_tree_entry_follow_symlinks() | Nguyễn Thái Ngọc Duy | 2019-06-27 | 3 | -14/+10 |
| * | | | | | | | tree-walk.c: remove the_repo from get_tree_entry() | Nguyễn Thái Ngọc Duy | 2019-06-27 | 11 | -26/+38 |
| * | | | | | | | tree-walk.c: remove the_repo from fill_tree_descriptor() | Nguyễn Thái Ngọc Duy | 2019-06-27 | 9 | -21/+29 |
| * | | | | | | | sha1-file.c: remove the_repo from read_object_with_reference() | Nguyễn Thái Ngọc Duy | 2019-06-27 | 7 | -13/+23 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ra/cherry-pick-revert-skip' | Junio C Hamano | 2019-07-19 | 11 | -26/+266 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | cherry-pick/revert: advise using --skip | Rohit Ashiwal | 2019-07-02 | 3 | -8/+34 |
| * | | | | | | | cherry-pick/revert: add --skip option | Rohit Ashiwal | 2019-07-02 | 7 | -6/+187 |
| * | | | | | | | sequencer: use argv_array in reset_merge | Rohit Ashiwal | 2019-07-02 | 1 | -6/+11 |
| * | | | | | | | sequencer: rename reset_for_rollback to reset_merge | Rohit Ashiwal | 2019-07-02 | 1 | -3/+3 |
| * | | | | | | | sequencer: add advice for revert | Rohit Ashiwal | 2019-07-02 | 4 | -6/+34 |
* | | | | | | | | Merge branch 'tb/ref-filter-multiple-patterns' | Junio C Hamano | 2019-07-19 | 2 | -26/+89 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | ref-filter.c: find disjoint pattern prefixes | Taylor Blau | 2019-06-27 | 2 | -26/+89 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'pw/status-with-corrupt-sequencer-state' | Junio C Hamano | 2019-07-19 | 2 | -22/+37 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | status: do not report errors in sequencer/todo | Phillip Wood | 2019-06-27 | 2 | -16/+24 |
| * | | | | | | | | sequencer: factor out todo command name parsing | Phillip Wood | 2019-06-27 | 1 | -6/+13 |
| * | | | | | | | | sequencer: always allow tab after command name | Phillip Wood | 2019-06-27 | 1 | -1/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ds/commit-graph-incremental' | Junio C Hamano | 2019-07-19 | 10 | -74/+1414 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | commit-graph: test verify across alternates | Derrick Stolee | 2019-06-19 | 1 | -0/+19 |
| * | | | | | | | | commit-graph: normalize commit-graph filenames | Derrick Stolee | 2019-06-19 | 2 | -8/+29 |
| * | | | | | | | | commit-graph: test --split across alternate without --split | Derrick Stolee | 2019-06-19 | 1 | -0/+15 |
| * | | | | | | | | commit-graph: test octopus merges with --split | Derrick Stolee | 2019-06-19 | 1 | -0/+11 |
| * | | | | | | | | commit-graph: clean up chains after flattened write | Derrick Stolee | 2019-06-19 | 2 | -3/+21 |
| * | | | | | | | | commit-graph: verify chains with --shallow mode | Derrick Stolee | 2019-06-19 | 5 | -14/+101 |
| * | | | | | | | | commit-graph: create options for split files | Derrick Stolee | 2019-06-19 | 8 | -24/+128 |
| * | | | | | | | | commit-graph: expire commit-graph files | Derrick Stolee | 2019-06-19 | 3 | -1/+85 |
| * | | | | | | | | commit-graph: allow cross-alternate chains | Derrick Stolee | 2019-06-19 | 4 | -11/+123 |