Skip to Content.
Sympa Menu

sm-discuss - Re: [SM-Discuss] scm next steps

sm-discuss AT lists.ibiblio.org

Subject: Public SourceMage Discussion List

List archive

Chronological Thread  
  • From: "Jeremy Blosser (emrys)" <jblosser-smgl AT firinn.org>
  • To: sm-discuss AT lists.ibiblio.org
  • Subject: Re: [SM-Discuss] scm next steps
  • Date: Mon, 1 May 2006 00:57:16 -0500

On Apr 30, Robin Cook [rcook AT wyrms.net] wrote:
> I think in trying to get it sync'ed I got my repository files messed up
> as well.
> But a lesson learned. Now if can figure out a way to see if a git
> update modifies files in a spell I'm about to update within a script....

git fetch && git diff master origin

This will show diffences between your copy and the pristine one from
upstream, before you update your working copy (via git pull . origin).
Again, this works for test since that's the master, if you want to do this
for devel or stable* you should keep the cloned branches pristine and make
your own branches off them to edit in (git checkout devel; git branch
my-devel).

Attachment: pgpODCXShMeAk.pgp
Description: PGP signature




Archive powered by MHonArc 2.6.24.

Top of Page