From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Wed, 12 Nov 2025 20:46:16 +0300 From: Mikhail Efremov To: devel-newbies@lists.altlinux.org Message-ID: <20251112204616.177a5a8b@sem.office.basealt.ru> In-Reply-To: <20251112195858.32eebe09@legato> References: <1e0a26fc-b507-4833-bfc3-d0a211bf0885@yandex.ru> <20251112195858.32eebe09@legato> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [newbies] git pull into subdirectory X-BeenThere: devel-newbies@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: "devel@ where you _can_ ask" List-Id: "devel@ where you _can_ ask" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Nov 2025 17:46:18 -0000 Archived-At: List-Archive: On Wed, 12 Nov 2025 19:58:58 +0300 Paul Wolneykien wrote: > =D0=92 Tue, 11 Nov 2025 21:36:19 +0300 > Alexander Lubyagin =D0=BF=D0=B8=D1=88=D0=B5=D1=82: >=20 > > =D0=94=D0=BE=D0=B1=D1=80=D1=8B=D0=B9 =D0=B4=D0=B5=D0=BD=D1=8C. > >=20 > > =D0=92=D0=BE=D0=B7=D0=BD=D0=B8=D0=BA =D1=82=D0=B0=D0=BA=D0=BE=D0=B9 =D0= =B2=D0=BE=D0=BF=D1=80=D0=BE=D1=81. > >=20 > > =D0=92=D0=BE =D0=BC=D0=BD=D0=BE=D0=B3=D0=B8=D1=85 =D1=80=D0=B5=D0=BF=D0= =BE=D0=B7=D0=B8=D1=82=D0=BE=D1=80=D0=B8=D1=8F=D1=85 =D0=90=D0=BB=D1=8C=D1= =82=D0=B0 =D0=BF=D1=80=D0=B8=D0=BD=D1=8F=D1=82 =D0=BF=D1=80=D0=B8=D0=BD=D1= =86=D0=B8=D0=BF - =D1=85=D1=80=D0=B0=D0=BD=D0=B8=D1=82=D1=8C =D0=B8=D1=81= =D1=85=D0=BE=D0=B4=D0=BD=D0=B8=D0=BA=D0=B8 =D0=B2=20 > > =D0=BF=D0=BE=D0=B4=D0=BA=D0=B0=D1=82=D0=B0=D0=BB=D0=BE=D0=B3=D0=B5 %nam= e/%name/ > >=20 > > =D0=9A=D0=B0=D0=BA =D0=BE=D1=84=D0=BE=D1=80=D0=BC=D0=B8=D1=82=D1=8C =D0= =BF=D0=B5=D1=80=D0=B2=D1=8B=D0=B9 =D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82, =D1= =87=D1=82=D0=BE=D0=B1=D1=8B =D0=B8=D0=B7 =D1=83=D0=B4=D0=B0=D0=BB=D1=91=D0= =BD=D0=BD=D0=BE=D0=B3=D0=BE =D1=80=D0=B5=D0=BF=D0=BE=D0=B7=D0=B8=D1=82=D0= =BE=D1=80=D0=B8=D1=8F =D1=81=D0=B2=D0=B5=D0=B6=D0=B8=D0=B5=20 > > =D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=D1=8B =D0=BF=D0=BE=D0=B4=D1=82=D1= =8F=D0=B3=D0=B8=D0=B2=D0=B0=D0=BB=D0=B8=D1=81=D1=8C =D1=81=D1=80=D0=B0=D0= =B7=D1=83 =D0=B2 =D0=BF=D0=BE=D0=B4=D0=BA=D0=B0=D1=82=D0=B0=D0=BB=D0=BE=D0= =B3 =D0=BF=D0=BE git fetch? =20 >=20 > =D0=92 =D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BD=D0=B5=D0=B5 =D0=B2=D1= =80=D0=B5=D0=BC=D1=8F =D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D1=83=D1= =8E =D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=83 git subtree. >=20 > =D0=A0=D0=B0=D0=BD=D0=B5=D0=B5 =D0=B6=D0=B5 =D0=B4=D0=B5=D0=BB=D0=B0=D0= =BB =D1=87=D0=B5=D1=80=D0=B5=D0=B7 -Xsubtree, =D1=82=D0=BE =D0=B5=D1=81=D1= =82=D1=8C: >=20 > git pull/merge --allow-unrelated-histories -Xsubtree=3Dsubdir/ ... >=20 > =D0=9F=D0=BE=D1=81=D0=BB=D0=B5 =D0=BF=D0=B5=D1=80=D0=B2=D0=BE=D0=B3=D0= =BE =D1=80=D0=B0=D0=B7=D0=B0 git =D0=BF=D0=BE=D1=82=D0=BE=D0=BC =D1=81=D0= =B0=D0=BC =D1=82=D1=83=D0=B4=D0=B0 =D1=81=D0=BA=D0=BB=D0=B0=D0=B4=D1=8B=D0= =B2=D0=B0=D0=B5=D1=82. =D0=9E=D0=B4=D0=BD=D0=B0=D0=BA=D0=BE, =D1=87=D1=82= =D0=BE=D0=B1=D1=8B =D0=BB=D1=8E=D0=B1=D0=BE=D0=B9 > =D0=B8=D0=B7 =D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85 =D1=81=D0=BF=D0=BE=D1= =81=D0=BE=D0=B1=D0=BE=D0=B2 =D1=81=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0= =BB, =D0=BD=D0=B5=D0=BE=D0=B1=D1=85=D0=BE=D0=B4=D0=B8=D0=BC=D0=BE, =D1=87= =D1=82=D0=BE=D0=B1=D1=8B subdir/ =D1=83=D0=B6=D0=B5 =D1=81=D1=83=D1=89=D0= =B5=D1=81=D1=82=D0=B2=D0=BE=D0=B2=D0=B0=D0=BB > _=D0=B2=D0=BD=D1=83=D1=82=D1=80=D0=B8 git_. =D0=94=D0=BB=D1=8F =D1=8D=D1= =82=D0=BE=D0=B3=D0=BE =D0=BD=D1=83=D0=B6=D0=BD=D0=BE =D1=81=D0=B4=D0=B5=D0= =BB=D0=B0=D1=82=D1=8C, =D0=BD=D0=B0=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D1=80, = =D0=B2=D0=BE=D1=82 =D1=82=D0=B0=D0=BA: >=20 > mkdir subdir > touch subdir/.gitignore > git add subdir/.gitignore > git commit -m "Prepare subdir for git://project.path/repo.git" >=20 > =D0=98 =D0=B4=D0=B0=D0=BB=D1=8C=D1=88=D0=B5 =D1=83=D0=B6=D0=B5 git subt= ree =D0=B8=D0=BB=D0=B8 git pull --allow.. -Xsubtree=3D... =D0=A3 =D0=BC=D0=B5=D0=BD=D1=8F =D0=BF=D0=BE=D1=87=D1=82=D0=B8 =D0=B2=D1=81= =D0=B5 =D1=80=D0=B5=D0=BF=D0=BE =D1=81 =D0=B0=D0=BF=D1=81=D1=82=D1=80=D0=B8= =D0=BC=D0=BD=D1=8B=D0=BC=D0=B8 =D0=B8=D1=81=D1=85=D0=BE=D0=B4=D0=BD=D0=B8= =D0=BA=D0=B0=D0=BC=D0=B8 =D0=B2 subtree, =D0=BD=D0=BE =D1=8F =D0=BF=D1=80= =D0=BE=D1=81=D1=82=D0=BE =D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=BB=D1=8E subtree =D0=BF=D0=BE =D0=B8=D0= =BD=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=86=D0=B8=D0=B8 =D1=81 https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.= html =D0=9D=D0=B8=D0=BA=D0=B0=D0=BA=D0=B8=D1=85 "touch subdir/.gitignore" =D0=BF= =D1=80=D0=B8 =D1=8D=D1=82=D0=BE=D0=BC =D0=BD=D0=B5 =D1=82=D1=80=D0=B5=D0=B1= =D1=83=D0=B5=D1=82=D1=81=D1=8F. =D0=9F=D0=BE=D1=82=D0=BE=D0=BC =D0=BC=D0=B5=D1=80=D0=B6=D1=83 =D0=B0=D0=BF= =D1=81=D1=82=D1=80=D0=B8=D0=BC =D0=BA=D0=B0=D0=BA git merge -X subtree=3D <=D1=82=D1=8D=D0=B3> =D0=95=D0=B4=D0=B8=D0=BD=D1=81=D1=82=D0=B2=D0=B5=D0=BD=D0=BD=D0=B0=D1=8F = =D0=BF=D1=80=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC=D0=B0, =D0=BA=D0=BE=D1=82=D0=BE= =D1=80=D1=83=D1=8E =D1=8F =D0=B2=D1=81=D1=82=D1=80=D0=B5=D1=87=D0=B0=D0=BB = =D0=BF=D1=80=D0=B8 =D1=82=D0=B0=D0=BA=D0=BE=D0=B9 =D1=81=D1=85=D0=B5=D0=BC= =D0=B5: =D0=B5=D1=81=D0=BB=D0=B8 =D0=B2 =D0=B4=D0=B5=D1=80=D0=B5=D0=B2=D0=B5 =D0=B8=D1=81=D1=85=D0=BE=D0=B4=D0=BD= =D0=B8=D0=BA=D0=BE=D0=B2 =D0=B0=D0=BF=D1=81=D1=82=D1=80=D0=B8=D0=BC=D0=B0 = =D0=B5=D1=81=D1=82=D1=8C =D0=BA=D0=B0=D1=82=D0=B0=D0=BB=D0=BE=D0=B3, =D0=B8= =D0=BC=D1=8F =D0=BA=D0=BE=D1=82=D0=BE=D1=80=D0=BE=D0=B3=D0=BE =D1=81=D0=BE= =D0=B2=D0=BF=D0=B0=D0=B4=D0=B0=D0=B5=D1=82 =D1=81 =D0=B8=D0=BC=D0=B5=D0=BD=D0=B5=D0=BC subdir (=D0=B0 =D0=BE=D0=B1=D1=8B=D1= =87=D0=BD=D0=BE =D1=8D=D1=82=D0=BE %name), =D1=82=D0=BE git'=D1=83 =D0=BC= =D0=BE=D0=B6=D0=B5=D1=82 =D1=81=D0=BD=D0=B5=D1=81=D1=82=D0=B8 =D0=BA=D1=80= =D1=8B=D1=88=D1=83 =D0=BF=D1=80=D0=B8 =D0=BC=D0=B5=D1=80=D0=B6=D0=B5. =D0=92 =D1=8D=D1=82=D0=BE=D0=BC =D1=81=D0= =BB=D1=83=D1=87=D0=B0=D0=B5 =D1=8F =D0=BF=D1=80=D0=BE=D1=81=D1=82=D0=BE =D0= =BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D1=8B=D0=B2=D0=B0= =D1=8E subdir =D0=B2 %{name}-src. =D0=92=D0=BF=D1=80=D0=BE=D1=87=D0=B5=D0=BC, =D0=B4=D0=B0=D0=B2=D0=BD=D0=BE = =D1=83=D0=B6=D0=B5 =D1=82=D0=B0=D0=BA=D0=BE=D0=B3=D0=BE =D0=BD=D0=B5 =D0=B2= =D0=B8=D0=B4=D0=B5=D0=BB, =D0=BC=D0=BE=D0=B6=D0=B5=D1=82 git =D1=83=D0=B6= =D0=B5 =D0=BD=D0=B0=D1=83=D1=87=D0=B8=D0=BB=D1=81=D1=8F =D1=81=D0=BF=D1=80= =D0=B0=D0=B2=D0=BB=D1=8F=D1=82=D1=8C=D1=81=D1=8F =D1=81 =D1=8D=D1=82=D0=B8=D0=BC. --=20 WBR, Mikhail Efremov