summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-07-19 11:30:20 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-07-19 11:30:20 -0700
commit92b1ea66b9a8f012a343ebc157c3441154e831f0 (patch)
tree7e1888fe1701819fb8130bce911c27b3ae6cd02c /Documentation/technical/trivial-merge.txt
parentMerge branch 'br/blame-ignore' (diff)
parentcommit-graph: test verify across alternates (diff)
downloadtgif-92b1ea66b9a8f012a343ebc157c3441154e831f0.tar.xz
Merge branch 'ds/commit-graph-incremental'
The commits in a repository can be described by multiple commit-graph files now, which allows the commit-graph files to be updated incrementally. * ds/commit-graph-incremental: commit-graph: test verify across alternates commit-graph: normalize commit-graph filenames commit-graph: test --split across alternate without --split commit-graph: test octopus merges with --split commit-graph: clean up chains after flattened write commit-graph: verify chains with --shallow mode commit-graph: create options for split files commit-graph: expire commit-graph files commit-graph: allow cross-alternate chains commit-graph: merge commit-graph chains commit-graph: add --split option to builtin commit-graph: write commit-graph chains commit-graph: rearrange chunk count logic commit-graph: add base graphs chunk commit-graph: load commit-graph chains commit-graph: rename commit_compare to oid_compare commit-graph: prepare for commit-graph chains commit-graph: document commit-graph chains
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions