From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Sat, 14 Feb 2009 23:33:41 +0300 From: Alexey Tourbin To: devel@lists.altlinux.org Message-ID: <20090214203341.GH31985@altlinux.org> Mail-Followup-To: devel@lists.altlinux.org References: Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="vs0rQTeTompTJjtd" Content-Disposition: inline In-Reply-To: Subject: Re: [devel] =?koi8-r?b?Z2l0IG1lcmdlIC1zIG91cnMgzsHPws/Sz9Q=?= X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.10b3 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Feb 2009 20:33:41 -0000 Archived-At: List-Archive: List-Post: --vs0rQTeTompTJjtd Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Feb 12, 2009 at 10:18:01AM +0300, Eugene Prokopiev wrote: > =F3=D5=DD=C5=D3=D4=D7=D5=C5=D4 =CC=C9 =C2=CF=CC=C5=C5 =D0=D2=C1=D7=C9=CC= =D8=CE=D9=CA =D3=D0=CF=D3=CF=C2 =D3=C4=C5=CC=C1=D4=D8 git merge -s ours > =CE=C1=CF=C2=CF=D2=CF=D4 (=DA=C1=D4=C5=D2=C5=D4=D8 =D7=D3=C5, =DE=D4=CF = =C5=D3=D4=D8 =D7 =D4=C5=CB=D5=DD=C5=CD =C2=D2=C1=CE=DE=C5 =D3=CF=C4=C5=D2= =D6=C9=CD=D9=CD =C4=D2=D5=C7=CF=C7=CF > =C2=D2=C1=CE=DE=C1), =DE=C5=CD =D0=C5=D2=C5=CE=CF=D3 =C6=C1=CA=CC=CF=D7 = =D3 =D0=CF=CD=CF=DD=D8=C0 git archive? First, you need a tree. And then, you need a commit. If you want to make various tricky things with git (and, most of the time, I would doubt you really want to), you need to understand how that lower-level "plumbing" model works. --vs0rQTeTompTJjtd Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkmXKqUACgkQfBKgtDjnu0aH6wCeIhjr/KdNdT/aip2sErgBzsdn j8oAnAvxTNbkLEs2ceDR042gEdGp34Fn =XKlZ -----END PGP SIGNATURE----- --vs0rQTeTompTJjtd--