diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-07-06 11:54:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-07-06 11:54:46 -0700 |
| commit | 5a1d9e8f8777a60d388278af6093af8483f48811 (patch) | |
| tree | 6af9bdd9f3d0b9b95c010c7e61b2ad08cc0e4aa3 /builtin/notes.c | |
| parent | Merge branch 'pb/complete-diff-options' (diff) | |
| parent | config: don't BUG when both kvi and source are set (diff) | |
| download | git-5a1d9e8f8777a60d388278af6093af8483f48811.tar.gz git-5a1d9e8f8777a60d388278af6093af8483f48811.zip | |
Merge branch 'gc/config-partial-submodule-kvi-fix'
Partially revert a sanity check that the rest of the config code
was not ready, to avoid triggering it in a corner case.
* gc/config-partial-submodule-kvi-fix:
config: don't BUG when both kvi and source are set
Diffstat (limited to 'builtin/notes.c')
0 files changed, 0 insertions, 0 deletions