From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9332 invoked by alias); 14 Oct 2011 12:54:20 -0000 Received: (qmail 9324 invoked by uid 22791); 14 Oct 2011 12:54:19 -0000 X-SWARE-Spam-Status: No, hits=-6.8 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 14 Oct 2011 12:54:02 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9ECs0Mo004395 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 14 Oct 2011 08:54:00 -0400 Received: from host1.jankratochvil.net (ovpn-116-16.ams2.redhat.com [10.36.116.16]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p9ECrwVq030225 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 14 Oct 2011 08:54:00 -0400 Received: from host1.jankratochvil.net (localhost [127.0.0.1]) by host1.jankratochvil.net (8.14.4/8.14.4) with ESMTP id p9ECrvvt016294; Fri, 14 Oct 2011 14:53:57 +0200 Received: (from jkratoch@localhost) by host1.jankratochvil.net (8.14.4/8.14.4/Submit) id p9ECrunx016288; Fri, 14 Oct 2011 14:53:56 +0200 Date: Fri, 14 Oct 2011 12:54:00 -0000 From: Jan Kratochvil To: Mark Kettenis Cc: eliz@gnu.org, pmuldoon@redhat.com, gdb@sourceware.org Subject: Re: GIT and CVS Message-ID: <20111014125356.GA15329@host1.jankratochvil.net> References: <83r52g1rly.fsf@gnu.org> <83hb3ckn2s.fsf@gnu.org> <201110141022.p9EAMrUN030848@glazunov.sibelius.xs4all.nl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201110141022.p9EAMrUN030848@glazunov.sibelius.xs4all.nl> User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes Mailing-List: contact gdb-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org X-SW-Source: 2011-10/txt/msg00117.txt.bz2 On Fri, 14 Oct 2011 12:22:53 +0200, Mark Kettenis wrote: > $ cvs update > (test changes, write changelog, send diff for review) [...] > With lots of "cvs diff" invocations in between to check my changes and > remind myself what I'm working on. Replace `cvs update' by: git stash; git pull; git stash pop Replace `cvs diff' by: git diff HEAD (not sure if the latter is needed but IMO it simplifies some assumptions) > and I have to commit half-finished work, You don't have to. > (I've tried git stash, but it didn't seem to support my > development style, at least "unstashing" didn't "just work" when I did > a git fetch in between). I do so sometimes myself, it works. BTW you are right this style is not native to GIT, you should be on branch. Regards, Jan