From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Mon, 18 Apr 2016 21:09:06 +0300 From: Mikhail Efremov To: devel-newbies@lists.altlinux.org Message-ID: <20160418210906.2d63bf67@sem-notebook> In-Reply-To: References: <01706fae-5216-e58d-37e9-91f99f3a89bb@ya.ru> X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.21; x86_64-alt-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [newbies] =?utf-8?b?0JrQsNC6INC/0YDQsNCy0LjQu9GM0L3QviDQt9Cw0Lw=?= =?utf-8?b?0LXRgNC20LjRgtGMINGBIHVwc3RyZWFtPw==?= 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: Mon, 18 Apr 2016 18:09:14 -0000 Archived-At: List-Archive: On Mon, 18 Apr 2016 22:16:24 +0700 =D0=90=D0=BD=D1=82=D0=BE=D0=BD =D0=9C=D0= =B8=D0=B4=D1=8E=D0=BA=D0=BE=D0=B2 wrote: > 18.04.2016 15:41, =D0=90=D0=BD=D1=82=D0=BE=D0=BD =D0=9C=D0=B8=D0=B4=D1=8E= =D0=BA=D0=BE=D0=B2 =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > > git merge -s subtree github/master > > =20 > =D0=9D=D0=B5 =D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82 :-( =D0=9A= =D0=BE=D0=BC=D0=BC=D0=B8=D1=82=D1=8B =D0=BF=D0=BE=D1=8F=D0=B2=D0=B8=D0=BB= =D0=B8=D1=81=D1=8C, =D0=B0 =D1=81=D0=BE=D0=B4=D0=B5=D1=80=D0=B6=D0=B8=D0=BC= =D0=BE=D0=B5 =D0=BA=D0=B0=D1=82=D0=B0=D0=BB=D0=BE=D0=B3=D0=B0 =D0=BE=D1=81= =D1=82=D0=B0=D0=BB=D0=BE=D1=81=D1=8C=20 > =D0=BF=D1=80=D0=B5=D0=B6=D0=BD=D0=B8=D0=BC. =D0=A1=D0=BE=D0=B1=D1=80=D0= =B0=D0=BB =D0=B2 =D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2=D0=BE=D0=BC =D0=B7=D0= =B0=D0=B4=D0=B0=D0=BD=D0=B8=D0=B8 =D0=B2 =D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1= =8C=D1=82=D0=B0=D1=82=D0=B5 =D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE 0.7.1 =D0= =B2=D0=B5=D1=80=D1=81=D0=B8=D1=8E=20 > 0.6.2 :-( =D0=97=D0=BD=D0=B0=D1=87=D0=B8=D1=82 =D1=87=D1=82=D0=BE-=D1=82=D0=BE =D0=BF= =D0=BE=D1=87=D0=B5=D0=BC=D1=83-=D1=82=D0=BE =D1=81=D0=BC=D0=B5=D1=80=D0=B6= =D0=B8=D0=BB=D0=BE=D1=81=D1=8C =D0=BD=D0=B5=D0=BF=D1=80=D0=B0=D0=B2=D0=B8= =D0=BB=D1=8C=D0=BD=D0=BE. =D0=AF =D0=BF=D1=80=D0=B5=D0=B4=D0=BF=D0=BE=D1=87= =D0=B8=D1=82=D0=B0=D1=8E =D0=BD=D0=B5 =D0=BF=D0=BE=D0=BB=D0=B0=D0=B3=D0=B0=D1=82=D1=8C=D1=81=D1=8F =D0=BD=D0=B0 = =D0=B0=D0=B2=D1=82=D0=BE=D1=83=D0=B3=D0=B0=D0=B4=D0=B0=D0=B2, =D0=B0 =D1=8F= =D0=B2=D0=BD=D0=BE =D1=83=D0=BA=D0=B0=D0=B7=D1=8B=D0=B2=D0=B0=D1=82=D1=8C = =D0=BA=D0=B0=D1=82=D0=B0=D0=BB=D0=BE=D0=B3 =D0=B4=D0=BB=D1=8F subtree: git merge -X subtree=3D =D0=94=D0=B0=D0=B6=D0=B5 =D1=82=D0=B0=D0=BA =D1=8F =D0=BF=D0=B0=D1=80=D1=83= =D1=80=D0=B0=D0=B7 =D1=81=D1=82=D0=B0=D0=BB=D0=BA=D0=B8=D0=B2=D0=B0=D0=BB= =D1=81=D1=8F =D1=81=D0=BE =D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=BD=D1=8B=D0=BC= =D0=B8 =D0=BF=D1=80=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC=D0=B0=D0=BC=D0=B8 =D0=BF= =D1=80=D0=B8 merge =D0=B2 subtree, =D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE =D1=8D=D1=82=D0= =BE =D0=B1=D1=8B=D0=BB=D0=B8 =D0=B1=D0=B0=D0=B3=D0=B8 =D0=B2 =D1=81=D0=B0= =D0=BC=D0=BE=D0=BC git. =D0=9D=D0=BE =D1=82=D0=B0=D0=BA=D0=BE=D0=B5 =D0=B1=D1=8B=D0=B2=D0=B0=D0=B5= =D1=82 =D0=BE=D1=87=D0=B5=D0=BD=D1=8C =D1=80=D0=B5=D0=B4=D0=BA=D0=BE, =D0= =BE=D0=B1=D1=8B=D1=87=D0=BD=D0=BE =D0=BD=D0=B8=D0=BA=D0=B0=D0=BA=D0=B8=D1= =85 =D0=BF=D1=80=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC =D0=BD=D0=B5 =D0=B2=D0=BE=D0= =B7=D0=BD=D0=B8=D0=BA=D0=B0=D0=B5=D1=82. =D0=AF =D0=B4=D0=B0=D0=B2=D0=BD=D0=BE =D1=83=D0=B6=D0=B5 =D0=BF=D0=BE=D1=87=D1=82= =D0=B8 =D0=B2=D0=BE =D0=B2=D1=81=D0=B5=D1=85 =D1=81=D0=B2=D0=BE=D0=B8=D1=85= gear-=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=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D1=83=D1=8E subtree (=D0=B8 = =D1=8F =D0=B4=D1=83=D0=BC=D0=B0=D0=BB, =D1=87=D1=82=D0=BE =D1=8F =D0=B5=D0=B4=D0= =B8=D0=BD=D1=81=D1=82=D0=B2=D0=B5=D0=BD=D0=BD=D1=8B=D0=B9, =D0=BA=D1=82=D0= =BE =D1=82=D0=B0=D0=BA =D0=B4=D0=B5=D0=BB=D0=B0=D0=B5=D1=82) =D0=B8 =D0=B5= =D0=B4=D0=B8=D0=BD=D1=81=D1=82=D0=B2=D0=B5=D0=BD=D0=BD=D0=BE=D0=B5 =D0=BE= =D1=82=D0=BB=D0=B8=D1=87=D0=B8=D0=B5 =D0=BF=D1=80=D0=B8 =D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B5 =D1=81 =D1=82=D0=B0=D0=BA=D0=B8=D0=BC= =D0=B8 =D1=80=D0=B5=D0=BF=D0=BE - =D1=8D=D1=82=D0=BE =D1=82=D0=BE=D0=BB=D1= =8C=D0=BA=D0=BE =D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D0=B0 =D0=B4=D0=BB=D1= =8F merge, =D1=81=D0=BE=D0=B1=D1=81=D1=82=D0=B2=D0=B5=D0=BD=D0=BD=D0=BE. =D0=92=D1=8B =D1=83 =D0=BF=D1=80=D0=B5=D0=B4=D1=8B=D0=B4=D1=83=D1=89=D0=B5= =D0=B3=D0=BE =D0=BC=D0=B0=D0=BD=D1=82=D0=B5=D0=B9=D0=BD=D0=B5=D1=80=D0=B0 = =D1=81=D0=BF=D1=80=D0=BE=D1=81=D0=B8=D1=82=D1=8C =D0=BD=D0=B5 =D0=BF=D1=80= =D0=BE=D0=B1=D0=BE=D0=B2=D0=B0=D0=BB=D0=B8, =D0=BA=D0=B0=D0=BA =D0=BE=D0=BD= =D0=B2=D0=B5=D0=BB =D1=8D=D1=82=D0=BE=D1=82 =D1=80=D0=B5=D0=BF=D0=BE=D0=B7=D0=B8=D1=82=D0=BE=D1=80=D0=B8=D0=B9? =D0=90 = =D1=82=D0=BE =D0=B2=D0=B4=D1=80=D1=83=D0=B3 =D0=BE=D0=BD =D0=BD=D0=B8=D0=BA= =D0=B0=D0=BA=D0=BE=D0=B3=D0=BE subtree =D0=B2=D0=BE=D0=BE=D0=B1=D1=89=D0=B5= =D0=BD=D0=B5 =D0=B4=D0=B5=D0=BB=D0=B0=D0=BB, =D0=BD=D0=B0=D0=BF=D1=80=D0= =B8=D0=BC=D0=B5=D1=80 (=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE =D0=B2=D0=B5=D0=B4=D1=8C =D0=B8 =D1=80=D1= =83=D0=BA=D0=B0=D0=BC=D0=B8 =D1=84=D0=B0=D0=B9=D0=BB=D0=B8=D0=BA=D0=B8 =D0= =BA=D0=BE=D0=BF=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C-=D0=BF=D0=B5=D1= =80=D0=B5=D0=BD=D0=BE=D1=81=D0=B8=D1=82=D1=8C). --=20 WBR, Mikhail Efremov