On Thu, Jan 19, 2012 at 03:55:26PM +0000, [email protected] wrote: > New patch set after: > > scripts/auxiliar/makeslr.py > git add Documentation/snippets/new/strict-beat-beaming.ly > git commit Documentation/snippets/new/strict-beat-beaming.ly > git reset --hard HEAD > > This properly updated strict-beat-beaming.ly, but avoids showing all > of the other snippets changed by convert-ly. Maybe we should add > this to the CG.
The proper thing is to: - make a branch - do a local lsr update - make your code and doc change - do a local lsr update - review, then merge with staging as a single commit or a special "merge commit" which git-rebase will handly properly; consult David about what that means in exact git terms. I personally would just squash the branch into a single commit, but a "separate branch merge" would be more appropriate for larger changes. - Graham _______________________________________________ bug-lilypond mailing list [email protected] https://lists.gnu.org/mailman/listinfo/bug-lilypond
