On Wed, Aug 12, 2009 at 11:02:45PM -0600, Joel Mahoney wrote:
> I'm not sure I completely understand where you guys are at with this
> thread : - ) but I thought I would mention that the question arose
> from my inability to install a plugin into a Ruby on Rails project
> based on my having (unknowingly) set branch.master.rebase = true.
>
> I bring this up because a lot of people are getting their first
> exposure to git through Rails/github, and installing plugins in Rails
> is (I think) a good example of brining an existing history (the
> plugin) into a separate repository (your project). and because this
> maneuver is built into the "./script/plugin install" action, it is
> not something that cannot be easily customized.
Yes, the discussion moved away bit from your original issue. To
summarize what is happening:
- Setting branch.master.rebase in your ~/.gitconfig is probably not a
good idea, as that tends to be a per-repository property, anyway.
You can work around the problem for now by removing it.
- Junio has committed a patch to fix the bug. It will definitely be in
v1.6.5. If this is a common setup for Rails people, maybe we should
consider putting it into 'maint' for v1.6.4.1.
-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html