From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Wed, 12 Nov 2025 19:58:58 +0300 From: Paul Wolneykien To: devel-newbies@lists.altlinux.org Message-ID: <20251112195858.32eebe09@legato> In-Reply-To: <1e0a26fc-b507-4833-bfc3-d0a211bf0885@yandex.ru> References: <1e0a26fc-b507-4833-bfc3-d0a211bf0885@yandex.ru> Organization: BaseALT X-Mailer: Claws Mail 3.20.0 (GTK+ 2.24.33; x86_64-alt-linux-gnu) 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 16:58:59 -0000 Archived-At: List-Archive: =D0=92 Tue, 11 Nov 2025 21:36:19 +0300 Alexander Lubyagin =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > =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 %name/= %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? =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. =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: git pull/merge --allow-unrelated-histories -Xsubtree=3Dsubdir/ ... =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: mkdir subdir touch subdir/.gitignore git add subdir/.gitignore git commit -m "Prepare subdir for git://project.path/repo.git" =D0=98 =D0=B4=D0=B0=D0=BB=D1=8C=D1=88=D0=B5 =D1=83=D0=B6=D0=B5 git subtre= e =D0=B8=D0=BB=D0=B8 git pull --allow.. -Xsubtree=3D... > =D0=92=D1=80=D1=83=D1=87=D0=BD=D1=83=D1=8E, =D1=83 =D0=BC=D0=B5=D0=BD=D1= =8F =D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B8=D0=BB=D0=BE=D1=81=D1=8C =D1=82=D0= =B0=D0=BA, =D0=B4=D0=BB=D1=8F =D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0 mdless (= markdown viewer in Ruby): >=20 > =C2=A0cd mdless > =C2=A0git init -b master . > =C2=A0git remote add upstream https://github.com/ttscoff/mdless > =C2=A0git remote -v > =C2=A0git fetch upstream > =C2=A0git merge -s ours --no-commit upstream/develop > =C2=A0git read-tree --prefix=3Dmdless -u upstream/develop > =C2=A0git commit -m "Subtree merged in mdless/" > =C2=A0git remote add local /opt/gk/man/mdless > =C2=A0git remote -v > =C2=A0git push --set-upstream local master > =C2=A0ls -l mdless/ > =C2=A0git ls-files | less >=20 > -- >=20 > =D0=9E=D0=B4=D0=BD=D0=B0=D0=BA=D0=BE, =D1=82=D0=B0=D0=BA=D0=B8=D0=BC =D1= =81=D0=BF=D0=BE=D1=81=D0=BE=D0=B1=D0=BE=D0=BC =D0=BF=D0=BE=D0=BB=D1=83=D1= =87=D0=B0=D0=B5=D1=82=D1=81=D1=8F =D0=B4=D1=83=D0=B1=D0=BB=D0=B8=D1=80=D1= =83=D1=8E=D1=89=D0=B8=D0=B9=D1=81=D1=8F =D1=81=D0=BF=D0=B8=D1=81=D0=BE=D0= =BA =D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2: =D0=B2 ./ =D0=B8 =D0=B2=20 > ./mdless/ >=20 > =D0=AF =D0=B8=D1=81=D0=BA=D0=B0=D0=BB =D0=B4=D1=80=D1=83=D0=B3=D0=B8=D0= =B5 =D1=81=D0=BF=D0=BE=D1=81=D0=BE=D0=B1=D1=8B. =D0=98=D0=B7 =D0=BD=D0=B0= =D0=B9=D0=B4=D0=B5=D0=BD=D0=BD=D1=8B=D1=85: > [1] =D0=98=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0= =B8=D0=B5 git subtree > [2] =D0=98=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0= =B8=D0=B5 git sparse checkout > [3] =D0=98=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0= =B8=D0=B5 git worktree > [4] =D0=98=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0= =B8=D0=B5 submodule > [5] =D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0= =BD=D0=B8=D0=B5 =D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2 + filter-branch:=20 > https://stackoverflow.com/a/4042965 >=20 > =D0=9A=D0=B0=D0=BA=D0=BE=D0=B9 =D0=B8=D0=B7 =D0=B2=D0=B0=D1=80=D0=B8=D0= =B0=D0=BD=D1=82=D0=BE=D0=B2 =D0=BD=D0=B0=D0=B8=D0=B1=D0=BE=D0=BB=D0=B5=D0= =B5 =D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9? > =D0=AF =D0=BF=D1=80=D0=BE=D0=B1=D0=BE=D0=B2=D0=B0=D0=BB =D1=81=D0=BC=D0= =BE=D1=82=D1=80=D0=B5=D1=82=D1=8C =D0=B2 =D0=B8=D0=BC=D0=B5=D1=8E=D1=89=D0= =B8=D1=85=D1=81=D1=8F =D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0=D1=85, =D0=BD=D0= =BE, =D0=B1=D1=8B=D0=B2=D0=B0=D0=B5=D1=82, changelog =D0=B4=D0=BB=D0=B8=D0= =BD=D0=BD=D0=B5=D0=B5,=20 > =D1=87=D0=B5=D0=BC git log. >=20 > =D0=98=D0=BB=D0=B8, =D0=B2=D1=81=D1=91 =D0=B6=D0=B5, =D0=BF=D1=80=D0=B0= =D0=B2=D0=B8=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9 =D0=B2=D0=B0=D1=80=D0=B8=D0=B0= =D0=BD=D1=82 - =D1=81 gear-uupdate?=20 > https://www.altlinux.org/Gear/gear-uupdate >=20 > -- >=20 > _______________________________________________ > devel-newbies mailing list > devel-newbies@lists.altlinux.org > https://lists.altlinux.org/mailman/listinfo/devel-newbies