git4idea: Implemeted forced merge/rebase and stash options for update operation