Allow to disable new built-in pull-rebase functionality
commit9b5985b2d62580a3c53ef309d5b356bf8fe4f239
authorSven Strickroth <email@cs-ware.de>
Mon, 29 Feb 2016 12:47:36 +0000 (29 13:47 +0100)
committerSven Strickroth <email@cs-ware.de>
Mon, 29 Feb 2016 18:47:18 +0000 (29 19:47 +0100)
treedf0bf16fe4a27bd9cfc0724c6a337c3aa5566839
parent45633068fcc3e56fb4822f00291412b118752e11
Allow to disable new built-in pull-rebase functionality

This is intended only as an emergency switch we hopefully never need.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/TortoiseProc/AppUtils.cpp
src/TortoiseProc/PullFetchDlg.cpp
src/TortoiseProc/Settings/SettingsAdvanced.cpp
src/TortoiseProc/SyncDlg.cpp