From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21180 invoked by alias); 14 Dec 2012 19:30:04 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 30888 Received: (qmail 4483 invoked from network); 14 Dec 2012 19:29:53 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED,RCVD_IN_DNSWL_MED,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.2 Received-SPF: none (ns1.primenet.com.au: domain at spodhuis.org does not designate permitted sender hosts) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=spodhuis.org; s=d201210; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; bh=zCDLhFp+A1q8Eo41jb9T3z0NEWeIgR2cvjGdouzyigE=; b=t7CJRn3cSXwViL+uyG4R8fWncpq0wNMgPua8lPyrwdQTAK8MJ2Na7ShOfwmb8iRbyQLxvYWdv8yX2CfAtOtzcTBy73+S9OhltHEc6RgS7AjvjOqoqBNO9WnO6tEOIDxWK8Dc6Uh0xnCi52UUgMK44GFVR/CzD0rd5dkbHuHFvcw=; Date: Fri, 14 Dec 2012 14:29:45 -0500 From: Phil Pennock To: Peter Stephenson Cc: Zsh workers Subject: Re: Access to CVS Message-ID: <20121214192945.GA40810@redoubt.spodhuis.org> Mail-Followup-To: Peter Stephenson , Zsh workers References: <17903.1355496262@thecus.kiddle.eu> <20121214150912.03bde6ae@pwslap01u.europe.root.pri> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20121214150912.03bde6ae@pwslap01u.europe.root.pri> On 2012-12-14 at 15:09 +0000, Peter Stephenson wrote: > I'm still hoping for a simple, straightforward list of the basic > commands you'd need to use *not* involving the manifold ramifications of > branches here, there and everywhere. Presumably this isn't more than > half a dozen commands or so. % $VISUAL file1.c file2.c new-file3.c % git add new-file3.c % git commit -a % git push "git commit -a" automatically finds files which are tracked and have been modified, but doesn't pick up files newly tracked. "git add" starts tracking a file. "git commit -a -i new-file3.c" should also add the file. If you want to be more selective, then for each file changed, "git add" it to stage it in the index for the next commit, then just "git commit" which will only commit the manually-staged files. "git push" assumes that you're on the master branch and the repository was created by cloning it from some place, with default options. Try to get the most recent version of git you can, they're in the middle of switching "git push" semantics to be saner/safer/cleaner by default ("only push the current branch, and only if this branch exists on the remote server") and you probably want this new default. Git 1.8+ Everything else is about building on that. It's just that with an existing repository and code-base where complexity is already an issue, you're in the unfortunate position of trying to avoid making the repository complicated and so folks are suggesting ways to minimise the history complexity of the repository, and so your learning curve is even steeper. I faced the same problems when Exim switched. :-/ -Phil