| Hi,
Thanks. It might be a good idea to activate the MediaWiki at
sourceforge and put stuff like this in there.
Cheers,
Andres
On Wed, Feb 16, 2011 at 3:52 AM, Felipe Sateler wrote:
> A short and terse intro to git. I will leave the "installing git" part
> as an exercise to the reader ;). All commands are preceded by a % to
> distinguish them.
>
> First of all, introduce yourself:
> % git config --global user.name "My Name"
> % git config --global user.email myemail@example.com
>
> Some other useful configs:
> Color output
> % git config color.ui auto
> % git config color.status auto
> % git config color.diff auto
> % git config color.branch auto
>
>
> Cloning (Checking out in CVS):
> % git clone repo/url
> The csound git urls (code and manual) will be published when the repo is ready.
>
> Reviewing the history:
> % git log
> The history of a file:
> % git log file
> Visual inspection:
> % gitk
>
> Updating the repository (CVS Update):
> % git pull
> This will fail if the local repository is dirty, either commit the
> changes or clear them (see below). Interested users may want to read
> up on the git stash command too.
>
>
> Check out who last modified each line in a file:
> % git blame file
>
> For developers:
>
> Check out which files have uncommited changes:
> % git status
>
> Check out uncommited changes:
> % git diff
>
> Commit a file:
> % git commit file
> Commit all tracked, but uncommited files:
> % git commit -a
> Note: git commit is NOT analogous to cvs commit in that the commit is
> not immediately propagated to the remote repository. You need to do
> this explicitly:
>
> Uploading changes to the remote repository:
> % git push
> Note: this will fail if there are commits in the remote repository
> that are not on your local repository. If this happens, you need to
> update your local copy first (with git pull) and fix conflicts, if
> necessary.
>
> If you don't have commit access to the remote repository, send a patch
> instead. If only sending a single commit:
> % git format-patch
> If you did N commits:
> % git format-patch -N
> This will produce N mbox-style files ready to be mailed.
>
> If such a patch has been received:
> % git am mbox
> Where mbox is the unix-style mbox containing the received patches.
>
> Add new files to the repository:
> % git add file
> Remove files:
> % git rm file
> Rename files:
> % git mv oldfile newfile
>
> Revert an uncommited change to a file:
> % git checkout file
> Note: do NOT use the "git revert" command, it has a completely
> different purpose.
>
>
> That's all I can remember may be useful for now. If you have
> questions, just ask.
>
> On Tue, Feb 15, 2011 at 22:20, Adam wrote:
>>
>> Many of us Csound users but non-developers download
>> from CVS.
>>
>> It would be handy to have a Csound page or text file somewhere
>> with these references collated. Also perhaps even a Mac, Linux,
>> Windows introduction or cheat-sheet for using GIT, for the Csound
>> community.
>>
>> For developers in particular, but us others too, to simply be
>> 'singing from the same sheet'.
>>
>> This suggestion below from Felipe is a case in point.
>>
>>
>>
>> On Wednesday 16 February 2011 06:04 am, Andres Cabrera wrote:
>>> Thanks for the advice. Now done.
>>>
>>> Cheers,
>>> Andres
>>>
>>> On Tue, Feb 15, 2011 at 1:17 PM, Felipe Sateler wrote:
>>> > Looks like a good doc, especially the "getting started with git"
>>> > section (the others are not really relevant for everyday usage).
>>> >
>>> > One thing I'd like to add before you do anything with Git: introduce
>>> > yourself to it! Issue the following commands so that your commits
>>> > show up with a reasonable name:
>>> >
>>> > git config --global user.name "My Name"
>>> > git config --global user.email myemail@example.com
>>> >
>>> >
>>> > That will make your commits show up with your name and email instead
>>> > of some weird thing git guessed was your name.
>>> >
>>> > On Mon, Feb 14, 2011 at 15:15, Andres Cabrera
>> wrote:
>>> >> Hi,
>>> >>
>>> >> I've been looking into this and learning git, and it looks great (at
>>> >> least on paper/screen...). I found this guide which might be of use:
>>> >> http://www.chem.helsinki.fi/~jonas/git_guides/HTML/CVS2git/CVS2git.html
>>> >>
>>> >> Cheers,
>>> >> Andres
>>> >>
>>> >> On Mon, Feb 14, 2011 at 3:08 PM, John ff wrote:
>>> >>> The overwhelming vote has been for git. A discussion with Felipe has
>>> >>> clarified my ideas, so the sooner we move the better.
>>> >>>
>>> >>> The stages are
>>> >>>
>>> >>> 1: Everyone commits to CVS anything the need to
>>> >>>
>>> >>> 2: Write access to CVS is (temporally) removed
>>> >>>
>>> >>> 3: Code (at least csound5 and manuals) moved to git
>>> >>>
>>> >>> 4: Write access to git opened up and CVS access rationalised
>>> >>>
>>> >>> 5: Distribution of basic instructions (I know there are help resources
>>> >>> but some assistance from git users to the rest of us would be nice)
>>> >>>
>>> >>>
>>> >>> Is there anything missing from that schedule?
>>> >>> When should we do it? I am hoping that the process should be of the
>>> >>> order of hours rather than days -- or even minutes.
>>> >>> Any offers to write a dummies guide to using git?
>>> >>>
>>> >>> I have looked at the preservation of the history and while not perfect
>>> >>> seems adequate.
>>> >>>
>>> >>> ==John ffitch
>>> >>>
>>> >>> -----------------------------------------------------------------------
>>> >>>------- The ultimate all-in-one performance toolkit: Intel(R) Parallel
>>> >>> Studio XE: Pinpoint memory and threading errors before they happen.
>>> >>> Find and fix more than 250 security defects in the development cycle.
>>> >>> Locate bottlenecks in serial and parallel code that limit performance.
>>> >>> http://p.sf.net/sfu/intel-dev2devfeb
>>> >>> _______________________________________________
>>> >>> Csound-devel mailing list
>>> >>> Csound-devel@lists.sourceforge.net
>>> >>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>> >>
>>> >> ------------------------------------------------------------------------
>>> >>------ The ultimate all-in-one performance toolkit: Intel(R) Parallel
>>> >> Studio XE: Pinpoint memory and threading errors before they happen.
>>> >> Find and fix more than 250 security defects in the development cycle.
>>> >> Locate bottlenecks in serial and parallel code that limit performance.
>>> >> http://p.sf.net/sfu/intel-dev2devfeb
>>> >> _______________________________________________
>>> >> Csound-devel mailing list
>>> >> Csound-devel@lists.sourceforge.net
>>> >> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>> >
>>> > --
>>> >
>>> > Saludos,
>>> > Felipe Sateler
>>> >
>>> > -------------------------------------------------------------------------
>>> >----- The ultimate all-in-one performance toolkit: Intel(R) Parallel
>>> > Studio XE: Pinpoint memory and threading errors before they happen.
>>> > Find and fix more than 250 security defects in the development cycle.
>>> > Locate bottlenecks in serial and parallel code that limit performance.
>>> > http://p.sf.net/sfu/intel-dev2devfeb
>>> > _______________________________________________
>>> > Csound-devel mailing list
>>> > Csound-devel@lists.sourceforge.net
>>> > https://lists.sourceforge.net/lists/listinfo/csound-devel
>>>
>>> ---------------------------------------------------------------------------
>>>--- The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio
>>> XE: Pinpoint memory and threading errors before they happen.
>>> Find and fix more than 250 security defects in the development cycle.
>>> Locate bottlenecks in serial and parallel code that limit performance.
>>> http://p.sf.net/sfu/intel-dev2devfeb
>>> _______________________________________________
>>> Csound-devel mailing list
>>> Csound-devel@lists.sourceforge.net
>>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>
>> ------------------------------------------------------------------------------
>> The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
>> Pinpoint memory and threading errors before they happen.
>> Find and fix more than 250 security defects in the development cycle.
>> Locate bottlenecks in serial and parallel code that limit performance.
>> http://p.sf.net/sfu/intel-dev2devfeb
>> _______________________________________________
>> Csound-devel mailing list
>> Csound-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>
>
>
>
> --
>
> Saludos,
> Felipe Sateler
>
> ------------------------------------------------------------------------------
> The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
> Pinpoint memory and threading errors before they happen.
> Find and fix more than 250 security defects in the development cycle.
> Locate bottlenecks in serial and parallel code that limit performance.
> http://p.sf.net/sfu/intel-dev2devfeb
> _______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel
>
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net
https://lists.sourceforge.net/lis |