-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am Freitag, 27. März 2009 schrieb Graham Percival: > On Thu, Mar 26, 2009 at 02:31:21PM -0700, Patrick McCarty wrote: > > Let's say remote master has changed in the meantime, and you want to > > create a new patch rebased on current master: > > > > cd lilypond > > git checkout master > > git pull > > git checkout mybranch > > git rebase master > > git format-patch master
It's actually easier: cd lilypond git checkout mybranch (unless you are already there) git fetch git rebase origin/master git format-patch origin/master > I'm still amazed at git. Simple things should be simple. I can > teach people how to use svn in 15 minutes. But to do the > equivalent of "svn update, svn add, svn ci" in git takes... well, > I don't know how long we've spent discussing it, but it's way more > than 15 minutes! git pull git add ... git commit git push origin master So, one additional command, but you don't mess with the server in the first three, so there is an additional safety net. Cheers, Reinhold - -- - ------------------------------------------------------------------ Reinhold Kainhofer, reinh...@kainhofer.com, http://reinhold.kainhofer.com/ * Financial & Actuarial Math., Vienna Univ. of Technology, Austria * http://www.fam.tuwien.ac.at/, DVR: 0005886 * LilyPond, Music typesetting, http://www.lilypond.org -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iD8DBQFJzPHkTqjEwhXvPN0RAl6XAJ412rPnD0/3qYOUDu/2UXfcHaERVwCfS6R6 Z+tMHr9wf1+umpFpTt38nbE= =+tw9 -----END PGP SIGNATURE----- _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
