Hi David, sorry but i don't understand if this applies to me? (i don't have push ability)
2011/8/2 David Kastrup <d...@gnu.org>: > Graham Percival <gra...@percival-music.ca> writes: > >> On Tue, Aug 02, 2011 at 10:32:15AM +0200, David Kastrup wrote: >>> >>> We have had several single-commit branches recently. Those appear in >>> the history just as "merge with master" and require additional work for >>> tracking the changes, worse so when the branchoff point is a long way >>> backwards. >>> >>> So please make it a habit to do >>> git rebase origin >>> before doing >>> git push > > The main point of a "rebase" is when you have been working on some > private functionality, and the main development has continued. If you > push your work after "git pull", you get a merge from your private > branch and the latest development. If you do "git rebase origin" > before, then your development is rewritten as if it were done on top of > the current origin/master. History is linear then and easier to follow. Regardless of whether this applies to me or not, does using git pull -r instead of plain git pull make this problem irrelevant, or am i wrong? cheers, Janek _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
