From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10650 invoked by alias); 14 Oct 2011 14:26:21 -0000 Received: (qmail 10636 invoked by uid 22791); 14 Oct 2011 14:26:20 -0000 X-SWARE-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_NONE,SPF_SOFTFAIL X-Spam-Check-By: sourceware.org Received: from mtaout22.012.net.il (HELO mtaout22.012.net.il) (80.179.55.172) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 14 Oct 2011 14:25:48 +0000 Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0LT2005007TEQ900@a-mtaout22.012.net.il> for gdb@sourceware.org; Fri, 14 Oct 2011 16:25:46 +0200 (IST) Received: from HOME-C4E4A596F7 ([84.228.93.74]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LT2005Q582X5690@a-mtaout22.012.net.il>; Fri, 14 Oct 2011 16:25:46 +0200 (IST) Date: Fri, 14 Oct 2011 14:26:00 -0000 From: Eli Zaretskii Subject: Re: GIT and CVS In-reply-to: <20111014125356.GA15329@host1.jankratochvil.net> To: Jan Kratochvil Cc: mark.kettenis@xs4all.nl, pmuldoon@redhat.com, gdb@sourceware.org Reply-to: Eli Zaretskii Message-id: <831uuflkeq.fsf@gnu.org> References: <83r52g1rly.fsf@gnu.org> <83hb3ckn2s.fsf@gnu.org> <201110141022.p9EAMrUN030848@glazunov.sibelius.xs4all.nl> <20111014125356.GA15329@host1.jankratochvil.net> 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/msg00123.txt.bz2 > Date: Fri, 14 Oct 2011 14:53:56 +0200 > From: Jan Kratochvil > Cc: eliz@gnu.org, pmuldoon@redhat.com, gdb@sourceware.org > > 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 But with bzr, you just say "bzr update" and that's it. > Replace `cvs diff' by: git diff HEAD But with bzr, you just say "bzr diff". > (not sure if the latter is needed but IMO it simplifies some assumptions) It is indeed one of my problems with git that I'm never sure what will happen if I omit certain arguments that are supposed to be the default. But I always thought that was because I don't use git enough. However, if people like you, who do it all the time, are still uncertain, then I guess it is something to consider when selecting a VCS. > > and I have to commit half-finished work, > > You don't have to. You mean, you can pull or merge when you have uncommitted changes? > BTW you are right this style is not native to GIT, you should be on branch. One problem with git is that too many things are not "right", and you are punished if you like them. I don't like software that imposes ideology on me. I do use local branches, but I don't like a tool that makes it very hard not to work from a local branch.