Fixed issue #2329: Changes track remote branch when fast forward is used

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
TortoiseGitBlame no longer shares settings with TortoiseGitUDiff

Based on TortoiseSVN revision 25981

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>