Option to merge instead of rebase; option to use desktop notifications as well as echo for errors

[TinaRussell]

The new option “gitSyncMethod” defaults to “rebase,” but you can set it to “merge” for the script to merge instead of rebase when repositories have diverged.

Another new option, “syncUseNotify,” defaults to “false,” while “true” means that all error messages will be sent to notify-send as well as echo.

These should’ve been two separate branches, I know. (I’m… new at this.)

[simonthum]

Hi Tina,

I would like to see your changes added. There are two issues however; one you mention. It should have been two commits (not branches, or at least not neccessarily).

The other is a bunch of whitespace changes that do not contribute to functionality and introduce whitespace errors.

I can work with what you provided but if you clean it yourself up I would be grateful.

[simonthum]

Ah, and a bit of documentation would be great. Not everybody enjoys reading prolonged bash.

[egerlach]

I would like to see this get into the git-sync script. Any objections to me taking a stab at a revised PR? @simonthum? @TinaRussell?

[simonthum]

Not at all! Just go ahead please.