On Sat, May 7, 2011 at 9:31 AM, William Kyngesburye <span dir="ltr"><<a href="mailto:woklist@kyngchaos.com">woklist@kyngchaos.com</a>></span> wrote:<br><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
Is this git thing on? Questions and confusion.<br>
<br>
Is there a git guide for dummies? I found <a href="http://www.qgis.org/wiki/Using_Git" target="_blank">http://www.qgis.org/wiki/Using_Git</a> 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.<br>
<br>
...Sorry if I seem a bit resistant.<br></blockquote><div><br></div><div>The best Git guide I have found that balances amount of information with concision is available at:</div><div><br></div><div> <a href="http://gitref.org">http://gitref.org</a></div>
<div><br></div><div>It was written by some members of the GitHub team and is designed to get you doing pull/commit/push as fast as possible.</div><div><br></div><div>Other great references containing advanced tricks are:</div>
<div><br></div><div> <a href="http://progit.org">http://progit.org</a></div><div> <a href="http://gitready.com">http://gitready.com</a></div><div><br></div><div>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:</div>
<div><ul><li>`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.</li><li>`git commit --amend` I use this all the time---merges changes into the last commit rather than creating a new commit.</li>
<li>`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`.</li>
<li>`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.</li>
</ul></div><div> </div><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
Are users migrated to git? Or do I need to register with github and ask for commit access?<br></blockquote><div><br></div><div>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.</div>
<div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
How long until 1.7 release? I would like to do the workaround for <a href="http://trac.osgeo.org/qgis/ticket/3497" target="_blank">http://trac.osgeo.org/qgis/ticket/3497</a> before release, and check over the Mac install/build instructions.</blockquote>
<div><br></div><div><br></div><div>Hope this helps!</div><div><br></div><div>-Charlie </div></div>