[Glass] Fwd: Re: [Pharo-dev] Unambiguously differentiating official and local builds [Was [Vm-dev] Moving the Cog subversion repository to githup at 2016-6-16 7am UTC]

[Dale Henrichs via Glass]

Forwarding this message to the GLASS mailing list mainly for the juicy 
set of links that Ben includes ...

Dale


-------- Forwarded Message --------
Subject: 	Re: [Pharo-dev] Unambiguously differentiating official and 
local builds [Was [Vm-dev] Moving the Cog subversion repository to 
githup at 2016-6-16 7am UTC]
Date: 	Fri, 17 Jun 2016 10:28:53 +0800
From: 	Ben Coman <btc at openinworld.com>
Reply-To: 	Pharo Development List <pharo-dev at lists.pharo.org>
To: 	Pharo Development List <pharo-dev at lists.pharo.org>


<snip>

Staging is a significant difference of git to svn, so a few opinions
on the benefit of staging [4] [5] [6] [7] is useful.

Personally I like the staging area as a final check to observe what
I'm *really* committing, particularly when my working area has become
a bit messy.  Now as described in one of the links, "git commit -a" is
a way ignore the staging area so git acts more like svn, but here are
some insightful stories from people that were initially annoyed by the
staging area but later found it useful [8] [9].


And btw, a quickstart git/svn cheat sheet [10].

cheers -ben

[1] https://www.git-tower.com/learn/git/ebook/en/command-line/appendix/from-subversion-to-git
[2] https://www.git-tower.com/learn/git/ebook/en/command-line/branching-merging/branching-can-change-your-life
[3] https://www.git-tower.com/learn/git/ebook/en/command-line/advanced-topics/undoing-things

[4] http://stackoverflow.com/questions/4878358/why-would-i-want-stage-before-committing-in-git
[5] http://programmers.stackexchange.com/questions/69178/what-is-the-benefit-of-gits-two-stage-commit-process-staging
[6] http://stackoverflow.com/questions/4878358/why-would-i-want-stage-before-committing-in-git
[7] http://gitolite.com/uses-of-index.html

[8] http://blog.osteele.com/posts/2008/05/my-git-workflow/
[9] http://2ndscale.com/rtomayko/2008/the-thing-about-git

[10] https://www.git-tower.com/blog/git-for-subversion-users-cheat-sheet/

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.gemtalksystems.com/mailman/private/glass/attachments/20160617/a9deed1c/attachment-0001.html>