[Qgis-developer] Git repo available for testing

[Charlie Sharpsteen]

On Sat, May 7, 2011 at 9:31 AM, William Kyngesburye
<woklist at kyngchaos.com>wrote:

> Is this git thing on?  Questions and confusion.
>
> Is there a git guide for dummies?  I found
> http://www.qgis.org/wiki/Using_Git but it seems overly complex.  I just
> want to do like I've done with svn - check out/update, make changes, and
> commit the changes.  3 steps.  Git checkout itself looks complex, let alone
> committing a change.
>
> ...Sorry if I seem a bit resistant.
>

The best Git guide I have found that balances amount of information with
concision is available at:

    http://gitref.org

It was written by some members of the GitHub team and is designed to get you
doing pull/commit/push as fast as possible.

Other great references containing advanced tricks are:

    http://progit.org
    http://gitready.com

I started out with SVN as well and used it happily for years.  However, Git
grew on me and I now use `git svn` as my SVN client. Some tricks that
delighted me when I first made the move:

   - `git add -p <file>` lets you interactively choose certain changes to a
   file to be added to a commit and leave the rest for later.
   - `git commit --amend` I use this all the time---merges changes into the
   last commit rather than creating a new commit.
   - `git stash` lets you set aside work and rewind to the last commit.
   Useful for when you are halfway through a feature implementation and realize
   there is a nasty bug that needs to be fixed *right now* and that should be
   in it's own commit. `git stash apply` lets you resume work after the bugfix.
   There is more too `git stash` as well, definitely browse `git help stash`.
   - `git rebase` lets you re-write and clean up history locally before
   publishing it to the world (actually, lets you re-write published history as
   well but that is frowned upon in most situations). Perfect for those
   situations where it takes three or four commits to actually kill a bug off
   due to dumb mistakes and unexpected corner cases. Among other things `git
   rebase` lets you re-pack all those commits into one commit.



Are users migrated to git?  Or do I need to register with github and ask for
> commit access?
>

Unless Tim has worked out some sort of deal with the GitHub staff to
automatically migrate accounts (never heard of that happening before), you
will need to register an account on GitHub and have him add you to the QGIS
organization.



> How long until 1.7 release?  I would like to do the workaround for
> http://trac.osgeo.org/qgis/ticket/3497 before release, and check over the
> Mac install/build instructions.



Hope this helps!

-Charlie
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.osgeo.org/pipermail/qgis-developer/attachments/20110507/4edae015/attachment.html