diff options
| author | George Hazan <ghazan@miranda.im> | 2018-06-07 00:11:22 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-06-07 00:11:22 +0300 |
| commit | 40ab0d9c0d42201a6548524e5c7821a02d35d561 (patch) | |
| tree | 00027538920fde2addcae088b8e7ac767771ba56 | |
| parent | 81b5ba78f96cb9adb24a9c8883edfbfc8cdfa94b (diff) | |
fix for resolving conflicts during poll
| -rw-r--r-- | tools/build_scripts/git_update.bat | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/build_scripts/git_update.bat b/tools/build_scripts/git_update.bat index 684ee6d786..d32d190bae 100644 --- a/tools/build_scripts/git_update.bat +++ b/tools/build_scripts/git_update.bat @@ -3,10 +3,10 @@ if "%1" == "" ( exit 1 ) -git checkout %1 - git reset --hard +git checkout %1 + git pull --rebase=true --progress -v echo %date% %time% > timestamp.chk
\ No newline at end of file |