I tend to do this in one window: gitt diff head^ | pbcopy
and in the other: pbpaste | patch -p 1 pbcopy / pbpaste are Mac commands for interacting with the system paste buffer On Wed, Nov 2, 2011 at 8:44 AM, Massimo Lusetti <mluse...@gmail.com> wrote: > On Mon, Oct 31, 2011 at 9:56 PM, Howard Lewis Ship <hls...@gmail.com> wrote: > >> It's awkward, but gets the job done. Hopefully the only additional >> change will be to switch over to the final version number. > > I'm having hard time managing to get patch out of git that will apply > cleanly to svn. > > Even with your workflow patch is not so happy. I've tried something like: > > git diff --no-prefix EAD~1 HEAD | sed -e "s/^diff --git > [^[:space:]]*/Index:/" -e > "s/^index.*/===================================================================/" >> /tmp/patch > > which will convert the output to something similar to svn diff but > without any luck... > > It's a pain in the ass ... > > Cheers > -- > Massimo > http://meridio.blogspot.com > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tapestry.apache.org > For additional commands, e-mail: dev-h...@tapestry.apache.org > > -- Howard M. Lewis Ship Creator of Apache Tapestry The source for Tapestry training, mentoring and support. Contact me to learn how I can get you up and productive in Tapestry fast! (971) 678-5210 http://howardlewisship.com --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tapestry.apache.org For additional commands, e-mail: dev-h...@tapestry.apache.org
