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>
Update documentation

Based on TortoiseSVN rev. 25982.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sync with TortoiseSVN

Use unique_ptr and drop logically dead code.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Drop logically dead code

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Fixed issue #2331: Show prefix log asterisk in Log Dialog

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Fix "move" missing on drag context menu on empty versioned folders

There seems to be a problem with ITEMIS_INGIT which is not always correctly set (e.g. a file is ITEMIS_NORMAL, but not ITEMIS_INGIT and thus cannot be moved).

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Minor code improvements

Signed-off-by: Yue Lin Ho <b8732003@student.nsysu.edu.tw>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Do not underline git hash in Describe line

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Fix some possible signedness problems

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Constify methods

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Add FETCH_HEAD to Log Dialog branch selector

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Fixed issue #2157: TortoiseGitMerge does not delete temporary files on close (marking as "resolved" in TGit was necessary)

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Fixed issue #1950: Log Dialog: File list filter

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Refactored: Move some logic to CGitDiff

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Add resolve submodule conflict dialog

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Refactored: Move conflict resolve code to CAppUtils

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Allow to resolve submodule conflicts and update list

Signed-off-by: Sven Strickroth <email@cs-ware.de>