question to git masters
I keep my dotfiles (.emacs, .xmonad, etc.) in a git repository which is published to github. Due to my poor git skills, I've got a rather curly patching history.
The question is: how can I make (and keep!) this repo flat, lined up?
...There are three Linux boxen - work, home laptop, and home desktop - which share most of dotfiles, but have small differencies in the remaining ones. For example, my .xmonad's have different screen resolutions hard-coded; on-screen notifications use different fonts according to display size, etc.
I wonder, whether I should have a preprocessing step to configure (m4) host-specific settings in...
* * *
Update
For true distributed development that supports proper merging, published branches should never be rewritten.
-- Git User's Manual, "Problems with rewriting history"
Looks like I should publish another repository - "correct" one - with straight patches' history. It can be 1) started from scratch (git-init) or 2) cherry-picked into desirable chain of patches (git-cherry-pick).