diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-02-17 17:21:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-17 17:21:42 -0800 |
| commit | 726b11d68a5e9092a668fd42acb3e25394f92995 (patch) | |
| tree | 3d52ea9498502e364f2735293a1fcfd415d3a19b /builtin/merge-recursive.c | |
| parent | Merge branch 'ew/rev-parse-since-test' (diff) | |
| parent | commit-graph: when incompatible with graphs, indicate why (diff) | |
| download | tgif-726b11d68a5e9092a668fd42acb3e25394f92995.tar.xz | |
Merge branch 'js/commit-graph-warning'
When certain features (e.g. grafts) used in the repository are
incompatible with the use of the commit-graph, we used to silently
turned commit-graph off; we now tell the user what we are doing.
* js/commit-graph-warning:
commit-graph: when incompatible with graphs, indicate why
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions