27 May
2015
27 May
'15
4:55 a.m.
Am 26.05.2015 um 16:04 schrieb Daniel Vetter:
-nigthly is a rebasing tree, git pull does the wrong thing for that. The proper way to track rebasing branches is (assuming you have no local patches that you want to keep):
$ git fetch origin $ git reset --hard @{upstream}
Thank you for the explanation.
Regards Rainer
--
Dipl.-Inf. (FH) Rainer Koenig
Project Manager Linux Clients
Dept. PDG WPS R&D SW OSE
Fujitsu Technology Solutions
Bürgermeister-Ullrich-Str. 100
86199 Augsburg
Germany
Telephone: +49-821-804-3321
Telefax: +49-821-804-2131
Mail: mailto:Rainer.Koenig@ts.fujitsu.com
Internet ts.fujtsu.com
Company Details ts.fujitsu.com/imprint.html