<div dir="auto"><div>Michael,<br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Michael Barton <<a href="mailto:Michael.Barton@asu.edu">Michael.Barton@asu.edu</a>> schrieb am Mi., 4. März 2020, 19:11:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div style="word-wrap:break-word;line-break:after-white-space">
Thanks Luca,
<div><br>
</div>
<div>I also found someone here that pointed that out. I originally got instructions from the GRASS WIKI. </div></div></blockquote></div></div><div dir="auto"><br></div><div dir="auto"><br></div><div dir="auto">Which URL?</div><div dir="auto"><br></div><div dir="auto">Markus</div><div dir="auto"><br></div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div style="word-wrap:break-word;line-break:after-white-space"><div>There is either an error or it is something that does not work for Macs. The examples use a colon to indicate the repository owner instead of a
slash. I had fixed that for the original clone command but did not catch it for the one setting upstream. </div>
<div><br>
</div>
<div>Also learned a new one that is exactly what I need in some circumstances: </div>
<div><br>
</div>
<div>git reset --hard origin/master</div>
<div><br>
</div>
<div>Michael<br>
<div>
<div dir="auto" style="text-align:start;text-indent:0px;word-wrap:break-word;line-break:after-white-space">
<div dir="auto" style="text-align:start;text-indent:0px;word-wrap:break-word;line-break:after-white-space">
<div style="text-align:start;text-indent:0px;word-wrap:break-word;line-break:after-white-space">
<div style="text-align:start;text-indent:0px;word-wrap:break-word;line-break:after-white-space">
<div style="text-align:start;text-indent:0px;word-wrap:break-word;line-break:after-white-space">
<div style="text-align:-webkit-auto;text-indent:0px;word-wrap:break-word;line-break:after-white-space">
<span style="border-collapse:separate;text-indent:0px;border-spacing:0px">
<div style="word-wrap:break-word;line-break:after-white-space">
<span style="border-collapse:separate;text-indent:0px;border-spacing:0px">
<div style="word-wrap:break-word;line-break:after-white-space">
<span style="border-collapse:separate;text-indent:0px;border-spacing:0px">
<div style="word-wrap:break-word;line-break:after-white-space">
<span style="border-collapse:separate;text-indent:0px;border-spacing:0px">
<div style="word-wrap:break-word;line-break:after-white-space">
<span style="border-collapse:separate;text-indent:0px;border-spacing:0px">
<div style="word-wrap:break-word;line-break:after-white-space">
<span style="border-collapse:separate;text-indent:0px;border-spacing:0px">
<div style="word-wrap:break-word;line-break:after-white-space">
<span style="border-collapse:separate;text-indent:0px;border-spacing:0px">
<div style="word-wrap:break-word;line-break:after-white-space">
<span style="border-collapse:separate;text-indent:0px;border-spacing:0px">
<div style="word-wrap:break-word;line-break:after-white-space">
<div>
<div style="color:rgb(0,0,0);letter-spacing:normal;text-transform:none;white-space:normal;word-spacing:0px;text-decoration:none;font-family:Helvetica;font-size:12px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-east-asian:normal;font-weight:normal;line-height:normal">
____________________</div>
<div style="font-variant-ligatures:normal;font-variant-east-asian:normal;line-height:normal">
<font face="Helvetica" size="3" style="color:rgb(0,0,0);letter-spacing:normal;text-transform:none;white-space:normal;word-spacing:0px;text-decoration:none">C. Michael Barton<br>
Director, Center for Social Dynamics & Complexity <br>
Professor of Anthropology, School of Human Evolution & Social Change<br>
Head, Graduate Faculty in Complex Adaptive Systems Science<br>
Arizona State University<br>
<br>
voice: 480-965-6262 (SHESC), 480-965-8130/727-9746 (CSDC)<br>
fax: 480-965-7671 (SHESC), 480-727-0709 (CSDC)<br>
www: <a href="http://www.public.asu.edu/~cmbarton" target="_blank" rel="noreferrer">http://www.public.asu.edu/~cmbarton</a>, </font><span style="text-align:-webkit-auto"><font size="3"><a href="https://complexity.asu.edu/csdc" target="_blank" rel="noreferrer">https://complexity.asu.edu/csdc</a></font></span></div>
</div>
<br>
</div>
</span><br>
</div>
</span><br>
</div>
</span><br>
</div>
</span><br>
</div>
</span><br>
</div>
</span><br>
</div>
</span><br>
</div>
</span><br>
</div>
<br>
</div>
<br>
</div>
<br>
</div>
<br>
</div>
<br>
</div>
<br>
<br>
</div>
<div><br>
<blockquote type="cite">
<div>On Mar 4, 2020, at 3:30 PM, Luca Delucchi <<a href="mailto:lucadeluge@gmail.com" target="_blank" rel="noreferrer">lucadeluge@gmail.com</a>> wrote:</div>
<br>
<div>
<div>Hi Michael,<br>
<br>
On Wed, 4 Mar 2020 at 19:49, Michael Barton <<a href="mailto:Michael.Barton@asu.edu" target="_blank" rel="noreferrer">Michael.Barton@asu.edu</a>> wrote:<br>
<blockquote type="cite"><br>
I want to do something that should be simple but it is not. I want to be able to update my fork of GRASS source code from master. The wiki instructions say I should be able to do this with:<br>
<br>
git fetch upstream<br>
git rebase upstream/master<br>
<br>
But when I do, I get:<br>
<br>
unable to access '<a href="https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com-3AOSGeo_grass.git_&d=DwIBaQ&c=l45AxH-kUV29SRQusp9vYR0n1GycN4_2jInuKy6zbqQ&r=lk-7X7CEOMDN8GaGVhiDsuO6gEp1wbG6nfT1XEEEtR0&m=ocylBhKg4eZ-QJLCBa53vt3dUwHB_ZET96-XkejX2FU&s=t9pyApmJY3B5H0nFh-Gm1IG1VGltt378-0JryEOEZG8&e=%20':%20Port%20number%20ended%20with%20'O" target="_blank" rel="noreferrer">https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com-3AOSGeo_grass.git_&d=DwIBaQ&c=l45AxH-kUV29SRQusp9vYR0n1GycN4_2jInuKy6zbqQ&r=lk-7X7CEOMDN8GaGVhiDsuO6gEp1wbG6nfT1XEEEtR0&m=ocylBhKg4eZ-QJLCBa53vt3dUwHB_ZET96-XkejX2FU&s=t9pyApmJY3B5H0nFh-Gm1IG1VGltt378-0JryEOEZG8&e=
': Port number ended with 'O</a>'<br>
<br>
</blockquote>
<br>
it seems wrong the url, it should be <a href="https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_OSGeo_grass.git&d=DwIBaQ&c=l45AxH-kUV29SRQusp9vYR0n1GycN4_2jInuKy6zbqQ&r=lk-7X7CEOMDN8GaGVhiDsuO6gEp1wbG6nfT1XEEEtR0&m=ocylBhKg4eZ-QJLCBa53vt3dUwHB_ZET96-XkejX2FU&s=2s0FIt9ZZMaEF8dGFczUzV71CeMzJZ3MBNeNaOmhcp4&e=" target="_blank" rel="noreferrer">
https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_OSGeo_grass.git&d=DwIBaQ&c=l45AxH-kUV29SRQusp9vYR0n1GycN4_2jInuKy6zbqQ&r=lk-7X7CEOMDN8GaGVhiDsuO6gEp1wbG6nfT1XEEEtR0&m=ocylBhKg4eZ-QJLCBa53vt3dUwHB_ZET96-XkejX2FU&s=2s0FIt9ZZMaEF8dGFczUzV71CeMzJZ3MBNeNaOmhcp4&e=</a>
<br>
<br>
<blockquote type="cite">Any suggestions? I don't want to have to keep forking and cloning<br>
<br>
Michael<br>
<br>
</blockquote>
<br>
<br>
-- <br>
ciao<br>
Luca<br>
<br>
<a href="http://www.lucadelu.org" target="_blank" rel="noreferrer">www.lucadelu.org</a><br>
</div>
</div>
</blockquote>
</div>
<br>
</div>
</div>
_______________________________________________<br>
grass-dev mailing list<br>
<a href="mailto:grass-dev@lists.osgeo.org" target="_blank" rel="noreferrer">grass-dev@lists.osgeo.org</a><br>
<a href="https://lists.osgeo.org/mailman/listinfo/grass-dev" rel="noreferrer noreferrer" target="_blank">https://lists.osgeo.org/mailman/listinfo/grass-dev</a></blockquote></div></div></div>