On Mon, Dec 03, 2012 at 06:42:24AM +0100, David Kastrup wrote: > For the record: I'd likely not use git pull -r (which basically is a > fetch and rebase on branch origin) in the LilyPond repository since it > is not always the right thing in our master/staging setup, and is > particularly wrong for long-running branches like translations.
A few years ago, a long discussion with John and other git people said that git pull -r was the best option for normal lilypond, while git pull was the best option for lilypond/translations. - Graham _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel