diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-24 21:28:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-24 21:28:41 (GMT) |
| commit | cda4ba30b1d6257524b9412ed4d7c44645fe0369 (patch) | |
| tree | c02dddf0db7583b8a3f50dc08c6b375103f97ed8 /Documentation/config.txt | |
| parent | f31d23a399d557d687266b4375a0436f920cc051 (diff) | |
| parent | 17f2f88c9c9e0015cba6d962dc6d9e2329ddf713 (diff) | |
| download | git-cda4ba30b1d6257524b9412ed4d7c44645fe0369.zip git-cda4ba30b1d6257524b9412ed4d7c44645fe0369.tar.gz git-cda4ba30b1d6257524b9412ed4d7c44645fe0369.tar.bz2 | |
Merge branch 'jk/warn-add-gitlink'
Using "git add d/i/r" when d/i/r is the top of the working tree of
a separate repository would create a gitlink in the index, which
would appear as a not-quite-initialized submodule to others. We
learned to give warnings when this happens.
* jk/warn-add-gitlink:
t: move "git add submodule" into test blocks
add: warn when adding an embedded repository
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index f6278a5..781ce3e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -348,6 +348,9 @@ advice.*:: rmHints:: In case of failure in the output of linkgit:git-rm[1], show directions on how to proceed from the current state. + addEmbeddedRepo:: + Advice on what to do when you've accidentally added one + git repo inside of another. -- core.fileMode:: |