> What I'd like to avoid is this situation : you do development on your > independent branch, making many temporary commits which leave > temporary logs. These temporary logs should not be seen in the > official master's history, but only one commit/merge done by the > official maintainer. I think that merging a branch would show all your > temporary steps arriving to the final result...
The workflow that git defines here is that you do your work, use interactive rebase to rewrite your local branch to look pretty and clear, then you post a pull request. Your clean history, not the mess you had during development, is then merged. Your clean history is visible to others after the merge. Clean history helps debugging and documentation. Commits should do small logical step-by-step changes as much as possible. -- Øyvind Harboe - Can Zylin Consulting help on your project? US toll free 1-866-980-3434 / International +47 51 87 40 27 http://www.zylin.com/ _______________________________________________ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
