On Sat, May 3, 2014 at 5:52 AM, Jason Curl <jcur...@googlemail.com> wrote:
> I have two repositories, one local, another one published (e.g. on
> CodePlex). The local repository is a large codebase and forms part of a
> framework, the published repository is a subset only contains about 5%. For
> the files that differ, they do so in a minor way (comments, namespaces,
> etc.).
>
> How can I (a) determine if a repository has changed since my last merge; and
> (b) merge between the two repositories so changes in either get pushed back?

I often do something similar. I think the easiest is to export GIT_DIR
to the repository you want to update, and then change directory where
you have the content you want to compare.

You can do 'git diff' and 'git add' and 'git commit' and GIT_DIR repo
will be updated.

-- 
Felipe Contreras

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to