Fixed issue #2147: Resolve not dealing correctly with (modify/delete) conflicts

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Change default gravatar URL to http://www.gravatar.com/avatar/%HASH%?d=identicon

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

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Ban more characters for ref names on Windows and with git command line

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

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Fixed issue #2148: Cherry pick with conflicts does not add "Cherry picked from..."

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
TortoiseGitMerge: Document the missing command line options

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Document more about create branch / tag

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Explain push options "Always push to the selected remote archive/branch for this local branch"

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Update tagopt meaning in Git Remote Settings documentation

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Add use case of tagopt=--tags

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