add more git aliases, settings for swap files