diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-03-03 08:53:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-03-03 08:53:02 -0800 |
| commit | 238c8d3984fc38d10a257c0972f142793ae5af96 (patch) | |
| tree | dc6c740861a3766e2a937701f6630b3efe4e552f /builtin/commit.c | |
| parent | ab09eddf601501290b5c719574fbe6c02314631f (diff) | |
| parent | 4ebba56419f0a7530ae8378284d7ee0cec22ebfa (diff) | |
Merge branch 'lo/doc-merge-submodule-update'
What happens to submodules during merge has been documented in a
bit more detail.
* lo/doc-merge-submodule-update:
merge-strategies.adoc: detail submodule merge
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions