librelist archives

git management of my fork...

From:

Greg Turnquist

Date:

2011-10-21 @ 14:03

Question about git repo management,

I started out by installing homebrew. Realizing I was missing a tool
(sslscan), I wrote a formula. To submit this, I forked homebrew on github,
did a "git remote add gregturn <my url>", git add <formula>, git commit, and
git push.

Now that it got accepted, when I did git pull origin, it created a branch to
pull in the tweaks that were made to my formula. Somehow, this history
doesn't look right. It seems to now be a combination of my history (
github.com/gregturn/homebrew) and the main project's history (
github.com/mxcl/homebrew). Is this how others manage things? Or should I
only track my own fork and use github to sync my repo with mxcl's? Or is
this just fine?

I use git all the time at work, but I haven't done much in the pull-request
means of operation.

Thanks,

-- 
Greg Turnquist (Greg.L.Turnquist@gmail.com)

On 21 Oct 2011, at 15:03, Greg Turnquist wrote:

> Now that it got accepted, when I did git pull origin, it created a 
branch to pull in the tweaks that were made to my formula. Somehow, this 
history doesn't look right. It seems to now be a combination of my history
(github.com/gregturn/homebrew) and the main project's history 
(github.com/mxcl/homebrew). Is this how others manage things? Or should I 
only track my own fork and use github to sync my repo with mxcl's? Or is 
this just fine?

Homebrew avoids merge commits so I tend to use git pull --rebase when 
updating instead of git pull.

--
Mike McQuaid
http://mikemcquaid.com

Okay, I was looking for something like that.

On Fri, Oct 21, 2011 at 9:08 AM, Mike McQuaid <mike@mikemcquaid.com> wrote:

>
> On 21 Oct 2011, at 15:03, Greg Turnquist wrote:
>
> > Now that it got accepted, when I did git pull origin, it created a branch
> to pull in the tweaks that were made to my formula. Somehow, this history
> doesn't look right. It seems to now be a combination of my history (
> github.com/gregturn/homebrew) and the main project's history (
> github.com/mxcl/homebrew). Is this how others manage things? Or should I
> only track my own fork and use github to sync my repo with mxcl's? Or is
> this just fine?
>
> Homebrew avoids merge commits so I tend to use git pull --rebase when
> updating instead of git pull.
>
> --
> Mike McQuaid
> http://mikemcquaid.com
>
>


-- 
Greg Turnquist (Greg.L.Turnquist@gmail.com)