Re: [git-users] Maintaining two loosely coupled repositories
On Sat, May 3, 2014 at 6:41 AM, Jason Curl jcur...@gmail.com wrote: On Sat, May 3, 2014 at 1:11 PM, Felipe Contreras felipe.contre...@gmail.com wrote: 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. As I've only started using git yesterday (migrated everything from SVN to GIT and made some inroads), do you have an example, or could point to a tutorial? So, for example I have Git repository called 'dotfiles' where I track the configurations in my $HOME. Many people have those repositories[1]. I have it in ~/dotfiles, but the real location of the Git directory is ~/dotfiles/.git. So I go to my home directory and do this: % export GIT_DIR=~/dotfiles/.git Now I can do `git diff` and see that for example my .alias file has modifications I don't have in my git repository, so I can do `git add .alias` and `git commit`. [1] https://github.com/search?q=dotfiles -- 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.
[git-users] Maintaining two loosely coupled repositories
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 thought about making patches for single files but this is very much manual work. If I do end up making changes in each repository by doing a manual merge, how do I record in git that a merge was made? -- 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.
Re: [git-users] Maintaining two loosely coupled repositories
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.
