From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ildar@altlinux.ru>
X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on sa.int.altlinux.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.0 required=5.0 tests=AWL,BAYES_00 autolearn=ham
	version=3.2.3
Date: Wed, 30 Apr 2008 11:34:35 +0600
From: Ildar Mulyukov <ildar@altlinux.ru>
To: ALT Linux Team development discussions <devel@lists.altlinux.org>
In-Reply-To: <20080429204236.GA21672@ricom.ru> (from samurai@ricom.ru on Wed
	Apr 30 02:42:38 2008)
X-Mailer: Balsa 2.3.23
Message-Id: <1209533675.12942.2@ildar.innovations.kz>
MIME-Version: 1.0
Content-Type: text/plain; charset=KOI8-R; DelSp=Yes; Format=Flowed
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
X-Drweb-SpamState: no
X-Drweb-SpamScore: -210
Subject: Re: [devel] =?utf-8?b?Z2l0INC40LfQtNC10LLQsNC10YLRgdGPPw==?=
X-BeenThere: devel@lists.altlinux.org
X-Mailman-Version: 2.1.10b3
Precedence: list
Reply-To: ALT Linux Team development discussions <devel@lists.altlinux.org>
List-Id: ALT Linux Team development discussions <devel.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/listinfo/devel>,
	<mailto:devel-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/devel>
List-Post: <mailto:devel@lists.altlinux.org>
List-Help: <mailto:devel-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/devel>,
	<mailto:devel-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Apr 2008 05:34:41 -0000
Archived-At: <http://lore.altlinux.org/devel/1209533675.12942.2@ildar.innovations.kz/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>

On 30.04.2008 02:42:38, Alexey Morsov wrote:
> =E7=CF=D3=D0=CF=C4=C1, git =DE=D4=CF, =CF=C2=DA=C1=D7=C5=CC=D3=D1 AI =C9 =
=D3=D4=C1=CC =C9=DA=C4=C5=D7=C1=D4=D8=D3=D1?
>=20
> samurai@home ~/git/sonata $ git checkout master
> fatal: Untracked working tree file 'sonata/sonata/audioscrobbler.py' =20
> would
> be removed by merge.
> samurai@home ~/git/sonata $ git status
> # On branch upstream
> nothing to commit (working directory clean)
> samurai@home ~/git/sonata $ gitk
> samurai@home ~/git/sonata $ gitk --all
> samurai@home ~/git/sonata $ find . -type f -size 0
> samurai@home ~/git/sonata $ grep '\n' sonata/sonata/audioscrobbler.py =20
> |wc
> -l
> 502
>=20
> =E9=CC=C9 =D1 =DE=C5=C7=CF-=D4=CF =CE=C5 =D0=CF=CE=C9=CD=C1=C0?
> git add =CE=C1 =DC=D4=CF=D4 =C6=C1=CA=CC =C4=C5=CC=C1=CC =CE=C1=D3=C9=CC=
=D8=CE=CF - =C5=CD=D5 =CD=CF=CE=CF=D0=C5=CE=C9=D3=D5=C1=CC=D8=CE=CF :(

	=F0=D2=C9=D7=C5=D4=D3=D4=D7=D5=C0!

=E4=D5=CD=C1=C0 =D4=C1=CB:
=E4=C9=C1=C7=CE=CF=DA: =C9=DA=CD=C5=CE=A3=CE=CE=D9=CA index, =CE=C1=D0=D2. =
=D3 =D0=CF=CD=CF=DD=D8=C0 git-add/rm/mv
=EC=C5=DE=C5=CE=C9=C5: git-reset
=EB=CF=CE=C5=DE=CE=CF, =CD=CF=C7=D5 =C9 =CF=DB=C9=C2=C9=D4=D8=D3=D1. =EB=C1=
=CB =D4=C1=CD =C7=CF=D7=CF=D2=D1=D4 =D2=C9=CD=CC=D1=CE=C5? =E8=D5=CD=C1=CE=
=D5=CD =C5=D2=D2=C1=D4=C1 =C5=D3=D4?

=F3 =D5=D7=C1=D6=C5=CE=C9=C5=CD, =E9=CC=D8=C4=C1=D2.
--=20
Ildar  Mulyukov,  free SW designer/programmer/packager
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
email: ildar@altlinux.ru
Jabber: ildar@jabber.ru
ICQ: 4334029
ALT Linux Sisyphus http://www.sisyphus.ru
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D