diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-06-25 13:22:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-25 13:22:36 -0700 |
| commit | a856e7d69f51776e40633d6f1f1f38a7fd64f0d5 (patch) | |
| tree | 33e27e4586004e0ef097f98a83e0fb359b9d637f /Documentation/git-merge-tree.txt | |
| parent | Merge branch 'nd/commit-util-to-slab' (diff) | |
| parent | commit-graph: fix UX issue when .lock file exists (diff) | |
| download | tgif-a856e7d69f51776e40633d6f1f1f38a7fd64f0d5.tar.xz | |
Merge branch 'ds/commit-graph-lockfile-fix'
Update to ds/generation-numbers topic.
* ds/commit-graph-lockfile-fix:
commit-graph: fix UX issue when .lock file exists
commit-graph.txt: update design document
merge: check config before loading commits
commit: use generation number in remove_redundant()
commit: add short-circuit to paint_down_to_common()
commit: use generation numbers for in_merge_bases()
ref-filter: use generation number for --contains
commit-graph: always load commit-graph information
commit: use generations in paint_down_to_common()
commit-graph: compute generation numbers
commit: add generation number to struct commit
ref-filter: fix outdated comment on in_commit_list
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions