Git: Prompt to commit when merge tool finishes after merge

Change-Id: I41a7e7febb77706e84595d560a8abb56a018a823
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Git: Use a single filename for log

The list always contains a single entry (or none) anyway

Change-Id: I567b622efd42dd6f676bebb92fbf1c8774bd80ff
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Git: Follow renames on log

Change-Id: Ic2666e62f5226780f68da0cdda0229b343d38116
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>