From: Junio C Hamano Date: Wed, 20 Dec 2023 18:14:53 +0000 (-0800) Subject: Merge branch 'mk/doc-gitfile-more' X-Git-Tag: v2.44.0-rc0~128 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d09302a01ecf53df3aa9997f7353fb4e845922c;p=thirdparty%2Fgit.git Merge branch 'mk/doc-gitfile-more' Doc update. * mk/doc-gitfile-more: doc: make the gitfile syntax easier to discover --- 2d09302a01ecf53df3aa9997f7353fb4e845922c diff --cc Documentation/glossary-content.txt index 59d8ab8572,3f912e7bb2..fbbb3f2de3 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@@ -202,9 -184,11 +202,11 @@@ current branch integrates with) obvious [[def_gitfile]]gitfile:: A plain file `.git` at the root of a working tree that points at the directory that is the real repository. + For proper use see linkgit:git-worktree[1] or linkgit:git-submodule[1]. + For syntax see linkgit:gitrepository-layout[5]. [[def_grafts]]grafts:: - Grafts enables two otherwise different lines of development to be joined + Grafts enable two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <> a <> has is different from what was recorded when the commit was