On Dec 10, 2008, at 11:52 AM, Ray Krueger wrote:
1) Can someone review the code changes for ERMA-13? It's in
http://github.com/mkemp/erma/tree/master. I forgot that git commits
are kept
separate, so the changes are actually split across two commits.
git rebase -i HEAD~5
Then "squash" your first commit into the second commit.
git rebase --continue
git push :)
I should probably issue the standard warning about not using this
feature on changes that have been shared with others. In this, case,
you're likely ok since no one as pulled those changes yet.
From the git-rebase man page:
When you rebase a branch, you are changing its history in a
way that will cause problems for anyone who already has a copy of
the branch in their repository and tries to pull updates from you.
You should
understand the implications of using git-rebase on a
repository that you share.
Also, it's my preference to commit early and often, so my patches are
usually multiple commits. If you want to keep the work separate until
it's been reviewed, I'd suggest pushing branches to your private fork
for review. You could probably name them after the bug you fixed and
delete them once you're fix is merged.
--
Doug Barth
_______________________________________________
Mailing list: https://launchpad.net/~erma-core
Post to : erma-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~erma-core
More help : https://help.launchpad.net/ListHelp
