Allow integration with git

Add a --git/-g option to add and merge command that will add the changes to git index.

Another possibility is doing it automatically when there is a .git directory at the root directory and opt-out with a --no-git option/config setting.