gitignore
ignore old content
ignore grfs (will get own git) and docs/own
automatic merging, pulling pushing of branches
ignore gitmake stamps and bundles
don't rebuild everything when merging master
ignore gitmake when checking for trunk updates
register new branches for smallmap
also merge/push texteff
add branches cargolist and cargomap to automagic merging
reenable auto-building
merge branches one by one instead of all at once
change merging order for smallmap-zoom-in to avoid needless conflicts
change merge order for smallmap-stats to avoid needless conflicts
add multimap to branch hierarchy
add set saveloading to branch hierarchy
also push slset
cargolist has been merged into master
new branch cargoset: preparing vehicle cargo lists for trunk
cut out obsolete branch "flowmapping-vehload"; cargomap reverts a big part of it