hmm... what does "git branch -r" say? also, what does "git branch" say?
On Sun, Aug 21, 2011 at 1:45 AM, hammett <[email protected]> wrote: > Same error.. > > On Sun, Aug 21, 2011 at 1:31 AM, Kelly Leahy <[email protected]> > wrote: > > you don't want that extra / at the end. > > > > just git diff master other/master > > > > Kelly > > > > On Sun, Aug 21, 2011 at 1:30 AM, hammett <[email protected]> wrote: > >> > >> Did I mess something up? > >> > >> $ git diff master other/master/ > >> fatal: ambiguous argument 'other/master/': unknown revision or path not > in > >> the w > >> orking tree. > >> Use '--' to separate paths from revisions > >> > >> $ git remote -v > >> origin [email protected]:castleproject/Castle.MonoRail3.git (fetch) > >> origin [email protected]:castleproject/Castle.MonoRail3.git (push) > >> other https://github.com/ploosqva/Castle.MonoRail3.git (fetch) > >> other https://github.com/ploosqva/Castle.MonoRail3.git (push) > >> > >> > >> On Sun, Aug 21, 2011 at 12:17 AM, hammett <[email protected]> wrote: > >> > Cool thing! Thanks, Kelly! > >> > > >> > On Sat, Aug 20, 2011 at 11:23 PM, Kelly Leahy < > [email protected]> > >> > wrote: > >> >> Hammett, if you fetch from one repo into yours, i.e. set up a remote > >> >> (called > >> >> "other" below) and do: > >> >> > >> >> git fetch other <branchname> > >> >> > >> >> (<branchname> is optional, if you don't supply it you'll get all of > >> >> their > >> >> branches) > >> >> > >> >> Then, you can do a diff using: > >> >> > >> >> git diff master other/master > >> >> > >> >> if, for instance, you want to compare their master branch to yours. > >> >> > >> >> In general, this command is: > >> >> > >> >> git diff <branch> <remote>/<remotebranch> > >> >> > >> >> as I've done it here. > >> >> > >> >> In even more general terms, git diff takes two "commit names" in this > >> >> usage. > >> >> On Sat, Aug 20, 2011 at 11:16 PM, hammett <[email protected]> wrote: > >> >>> > >> >>> how do I compare two repositories? should I merge and see the diff? > >> >>> > >> >>> On Sat, Aug 20, 2011 at 2:19 PM, Tomek Pluskiewicz > >> >>> <[email protected]> > >> >>> wrote: > >> >>> > On Sunday, August 14, 2011 8:48:08 PM UTC+2, hammett wrote: > >> >>> >> > >> >>> >> On Sun, Aug 14, 2011 at 10:15 AM, Tomek Pluskiewicz > >> >>> >> <[email protected]> > >> >>> >> wrote: > >> >>> >> > OK, so I've started experimenting with implementing Spark View > >> >>> >> > Engine > >> >>> >> > for > >> >>> >> > MR3 > >> >>> >> > >> >>> >> Bravo :-) > >> >>> > > >> >>> > Hi > >> >>> > I've forked MR3 and there is some work done already implementing > >> >>> > Spark > >> >>> > for > >> >>> > MonoRail 3. > >> >>> > https://github.com/ploosqva/Castle.MonoRail3 > >> >>> > > >> >>> > Minor refactorings are still needed, especially in the way views > are > >> >>> > resolved. I'm still exploring the new API. > >> >>> > Other than that, basic views and simple components with just body > >> >>> > work > >> >>> > already. I am in progress of porting the test suite from Spark's > >> >>> > existing > >> >>> > Monorail library > >> >>> > I would love to hear some constructive criticism. > >> >>> > Regards > >> >>> > Tomasz > >> >>> > > >> >>> > -- > >> >>> > You received this message because you are subscribed to the Google > >> >>> > Groups > >> >>> > "Castle Project Development List" group. > >> >>> > To view this discussion on the web visit > >> >>> > > https://groups.google.com/d/msg/castle-project-devel/-/tS2fpk1r7rIJ. > >> >>> > To post to this group, send email to > >> >>> > [email protected]. > >> >>> > To unsubscribe from this group, send email to > >> >>> > [email protected]. > >> >>> > For more options, visit this group at > >> >>> > http://groups.google.com/group/castle-project-devel?hl=en. > >> >>> > > >> >>> > >> >>> > >> >>> > >> >>> -- > >> >>> Cheers, > >> >>> hammett > >> >>> http://hammett.castleproject.org/ > >> >>> > >> >>> -- > >> >>> You received this message because you are subscribed to the Google > >> >>> Groups > >> >>> "Castle Project Development List" group. > >> >>> To post to this group, send email to > >> >>> [email protected]. > >> >>> To unsubscribe from this group, send email to > >> >>> [email protected]. > >> >>> For more options, visit this group at > >> >>> http://groups.google.com/group/castle-project-devel?hl=en. > >> >>> > >> >> > >> >> -- > >> >> You received this message because you are subscribed to the Google > >> >> Groups > >> >> "Castle Project Development List" group. > >> >> To post to this group, send email to > >> >> [email protected]. > >> >> To unsubscribe from this group, send email to > >> >> [email protected]. > >> >> For more options, visit this group at > >> >> http://groups.google.com/group/castle-project-devel?hl=en. > >> >> > >> > > >> > > >> > > >> > -- > >> > Cheers, > >> > hammett > >> > http://hammett.castleproject.org/ > >> > > >> > >> > >> > >> -- > >> Cheers, > >> hammett > >> http://hammett.castleproject.org/ > >> > >> -- > >> You received this message because you are subscribed to the Google > Groups > >> "Castle Project Development List" group. > >> To post to this group, send email to > >> [email protected]. > >> To unsubscribe from this group, send email to > >> [email protected]. > >> For more options, visit this group at > >> http://groups.google.com/group/castle-project-devel?hl=en. > >> > > > > -- > > You received this message because you are subscribed to the Google Groups > > "Castle Project Development List" group. > > To post to this group, send email to > [email protected]. > > To unsubscribe from this group, send email to > > [email protected]. > > For more options, visit this group at > > http://groups.google.com/group/castle-project-devel?hl=en. > > > > > > -- > Cheers, > hammett > http://hammett.castleproject.org/ > > -- > You received this message because you are subscribed to the Google Groups > "Castle Project Development List" group. > To post to this group, send email to [email protected] > . > To unsubscribe from this group, send email to > [email protected]. > For more options, visit this group at > http://groups.google.com/group/castle-project-devel?hl=en. > > -- You received this message because you are subscribed to the Google Groups "Castle Project Development List" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/castle-project-devel?hl=en.
