move option definition to top for archive and git