git is not the problem your pattern is.
isolate your configuration into as few files as possible.
commit a template for that file(s). (so that new devs can copy it into place
and edit it once)
then add the real file to the .gitignore so that it isn't tracked.
Now if you want to get fancy use your deployment tool to upload the correct
template or build it on the fly for each system you expect to deploy to.
On Fri, Nov 12, 2010 at 11:59 AM, ruud <r.grosm...@gmail.com> wrote:
> hi group,
> I am very happy to have left rcs, cvs and subversion behind me and
> have adopted git.
> However, I am not so fluent with it as I used to be with CVS.
> git has a lot of commands and options I don't use. Hopefully you can
> advice me on this one.
> I work on several project on two sites: the site the software wil run
> on eventually and on my laptop.
> The two sites differ: the operating system is different, the installed
> software is a bit different and the file system has another structure.
> When I pull from the git repository, the first thing I have to do is
> to adjust the software and inifiles a bit so that it runs on my
> laptop. When I push to the repository, I have to undo the changes
> before pushing.
> And the next time, I have to do exactly the same.
> I do the adjustments now in a commit on its own, so that I can undo
> that one with rebase, but I am still not comfortable with it. I have a
> feeling there must be a better way, a git way to apply and un-apply
> the environment changes.
> Can you advice me what commands I can use to tackle this little
> thanks, Ruud
> You received this message because you are subscribed to the Google Groups
> "Git for human beings" group.
> To post to this group, send email to git-us...@googlegroups.com.
> To unsubscribe from this group, send email to
> For more options, visit this group at
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to
For more options, visit this group at