GIT repositories with some different files

I’m just getting started with Git.
I’ve got:

  • a repository on my local machine for web development /www/my-web-app/ and
  • on a remote server I have a bare repository /www/git-repo/ and then the actual web app /www/production-my-web-app/.

I’m currently pushing from my local machine to the bare repository and then pulling that in the production repository.

  • showing more context in git add
  • Commits in a git bundle
  • Git submodule alternative?
  • How can I show the contents of a file at a specific state of a git repo?
  • git - see branches introduced between two commits?
  • “Unable to obtain your identity” error in Git
  • The issue is I have a couple of config files that are different in production.
    I have them ignored but I can’t figure out a way to upload them (can’t do it via FTP for some reason) and I’m sure I’m just missing an obvious facility of git.

    Any help is appreciated, thanks!

  • How to use Git to have different working directory structures on different platforms?
  • Configure git to allow cli push/pull without password prompt - netrc ignored?
  • Force Feature Branch to be Rebased Before it is Merged or Pushed
  • Rewriting git history to unpack a squashed commit
  • How to choose --prefix for git svn clone
  • Get Git to overwrite local changes but to keep untracked files
  • One Solution collect form web for “GIT repositories with some different files”

    The feature you might have missed and should help in your case is the “content filter driver“, especially the smudge step.

    content filter driver

    The idea is to version a:

    • template of your config file
    • a script (smudge) able to take the template and generate a private (ie non-versioned) config file
    • some non-production values (used by the script when called from your local machine)

    That way, that same smudge script will use external values when used in a production environment, that is secret values not stored in a git repo (no danger for them to be cloned/pushed around).
    As opposed to your local machine where those test values can be safely versioned in a Git repo.

    If there is no “secret data” issue, you can simply version several “config value” files, one per environment, leaving it to your smudge script to:

    • detect in what environment it is being called (automatically during the git checkout)
    • use the right “config value” script to generate the proper config file.
    Git Baby is a git and github fan, let's start git clone.