Evil Gitorious project (was: Re: Name)
Vegard Øye
vegard_oye at hotmail.com
Tue Mar 1 22:48:10 CET 2011
On 2011-03-01 21:03 +0100, Frank Fischer wrote:
> Then it's evil ;)
And so it is: http://gitorious.org/evil :)
As a starting point, I have uploaded parts of the development code
I showed you earlier. Please verify that you have commit access by
following these steps:
* Go to Dashboard -> Manage SSH keys > Add SSH keys and upload the
right file from ~/.ssh/. (If you don't have a SSH key, you can
generate one with ssh-keygen -C "your at email.org".)
* Set up your Git name and e-mail:
git config --global user.name "Your Name"
git config --global user.email "your at email.org"
* Download the repository:
git clone git at gitorious.org:evil/evil.git
You'll need the password for your SSH key, of course.
(Non-committers can do git clone git://gitorious.org/evil/evil.git.)
* Make a change. You can commit it with the command:
git commit -a
That will bring up an editor for the commit message. It should
consist of a brief summary in the imperative (no period), followed
by a blank line, followed by one or more additional sentences as
necessary. For example:
Add license
The license is GNU GPLv2. Or anything.
* Push your changes with:
git push
If I have pushed in the meantime, you will get an error, and must
weave those changes into your own. You can do:
git pull
This will download my changes and merge them into yours.
Alternatively:
git pull --rebase
This will just put your changes on top of mine. The latter is
preferred if the changes are trivial and/or there is no overlap,
since it retains a linear history.
If there is overlap, you must merge and sort out any merge conflicts.
See http://progit.org/book/ch3-2.html#basic_merge_conflicts for
details. The first three chapters of that book should sort out the
main Git/Mercurial differences.
I hope the initial hurdles are surmountable. Let's get started!
--
Vegard
More information about the implementations-list
mailing list