Take the 2-minute tour ×
Server Fault is a question and answer site for system and network administrators. It's 100% free, no registration required.

went through multiple searches, but couldn't find a question that describes this git branch strategy idea on SU or SF. /etc count is currently < 10.

firstly, are there any obvious oversights on my part for using git branches for multiple machine etc-s? i.e. i noticed a "git branches are meant to be shortlived" in one question i browsed.

my primary motivation is the ability to quickly compare and secondarily replicate usually random individual configuration files. it'd be good to have everything pushable into a single central repo for backup.

another issue i think that might be is i'd like to have the central repo with all branches available and visible only in some central management superservermachine directory. actual production /etc-s wouldn't need to have all the history of all the other branches, just the one that's assigned to it. i believe that's possible with making a repo only track a specific remote branch. right?

share|improve this question
    
ok serverfault.com/questions/28973/… is actually close, proceeding to read through it –  lkraav Nov 14 '10 at 14:27

1 Answer 1

The other question's motivation was replicating as a backup. As far as going further:

Compare works well enough (git diff, with globs, --stat and friends), but replicate is harder. You can cherry-pick if the base files are identical. You can also force checkout individual files. Mergeing will prove too hard for two reasons:

  • it is designed to make branches converge. Unless you have topic branches for everything, or unless you are making a one-size-fit-all configuration with switches, this will mess up your /etc.
  • it needs a common history. Even if you graft a common origin you'll have a lot of churn unrelated to the merge, which git merge will incorporate anyway.
share|improve this answer

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

Not the answer you're looking for? Browse other questions tagged or ask your own question.