From: Thomas Rast <trast@student.ethz.ch>
To: Alex Amiryan <alex@amiryan.org>
Cc: <git@vger.kernel.org>
Subject: Re: Update working copy on push without touching several files
Date: Tue, 20 Oct 2009 18:45:59 +0200 [thread overview]
Message-ID: <200910201846.00650.trast@student.ethz.ch> (raw)
In-Reply-To: <4ADDCC7A.8080607@amiryan.org>
Alex Amiryan wrote:
> Online versions of websites are maintained with git
> too. I need to have working copy of my remote git repository (online
> version of the site) updated by git push (which I do locally). The
> problem is that I have some files there (like database config) that have
> to be different from local ones and they must not be updated on git
> push.
My best results so far were with special config branches that are
auto-merged in post-receive. As a simple example, post-receive might
simply be
#!/bin/sh
git checkout -f master^0
git merge config
--
Thomas Rast
trast@{inf,student}.ethz.ch
prev parent reply other threads:[~2009-10-20 16:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-20 14:43 Update working copy on push without touching several files Alex Amiryan
2009-10-20 16:45 ` Thomas Rast [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200910201846.00650.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=alex@amiryan.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).