Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [sumo-dev] Merge options for git pull
  • From: Michael Behrisch <oss@xxxxxxxxxxx>
  • Date: Mon, 26 Oct 2020 17:58:54 +0100
  • Autocrypt: addr=oss@xxxxxxxxxxx; prefer-encrypt=mutual; keydata= xsDiBFLSvucRBACGsasS4GeIWs1CFNTOYmp3ScQ2ZTJLJWQxhPliwtHTzLsErYu9Y7e8qDov iHFviYyaNuceUNoACm1e4MT4eu0DmM2Wk3y/jjD6hfm7L0EZNPxQhj+CJf2oZAm2ezCe7/si xZ2d7TCO8yWavOGbF0EVi/ZDIJqVgupu6WBpv/NCewCg65HQiS1wm+1w1MdFYxKCmXzbv08D /iWXX3tzabbCrLlUum8hBgBpJEHRtlic2uaGsKm8Fize4tfLZkTBbTYLYXfcx2Oq9+lINPTW h9jnbCjAjErRWLTjNTQjel0JnDryCnqabub/R3wScR/EHRDBeS9L6YRj0xdVd2qIaArtSYRR auKPNc4M2qZNEFSM37cXC7avhpdeA/99oJf4qyVly4RxHmekAmj9UJjRx17x9xX8t9uzUuSt AeTh+kQ3o5jK7veU6/F/+pPyi96EOzym9BJA8pgXC8hLWNjOajI10filkdQ26QsfHOpUdPSZ 4Duyw9Ayj8loagEnnAONmU/xE0QlyVBANIut0W+SNqPScYXfnBbVOaG3Hc0mTWljaGFlbCBC ZWhyaXNjaCA8bWljaGFlbEBiZWhyaXNjaC5kZT7CZgQTEQIAJgIbIwcLCQgHAwIBBhUIAgkK CwQWAgMBAh4BAheABQJS0sKXAhkBAAoJEDwQ/pbRcKYp+SEAoMJSvUzfk3u6EA1nMlMVSk85 nHhoAJ0VE5xLi2ni8j9wdx+uga7XGLtjhs7ATQRS0r7nEAQAkQLdzlu3i/Ddziadm2c/60ZX bcY3FYhHHfsKUHC/QING+lu3uHG0nPaElPTAHTr8UdFMbmpXkRs9+1v1RAvHBWW95BbUXZeu oBsoCm+4Jdktu+PeVxGKhOwQRdR30A4y/bIeRn7iMzkZKoQh0lE3ZEbs0T8TUHBGBUqwEhIv Y0MAAwUD/RXrkwtUiR61/bT96eMaxGtO15AqvlM8DYQ3Xs6EH09QlGzr/i0+usi01wGoh13p YGjzEDtTqO+lNs9AtS7nZAHA3cCWzLmdEXw6EY7IH4X7zOpKoj+JtLNjUd2Nzvhyl48LT217 g8GmCACL6Wo/G+fZ+30Mny+gWbDtEGXNIv7fwkkEGBECAAkFAlLSvucCGwwACgkQPBD+ltFw pimNZQCgnN5oibnjl7r2SVle6hgUMcckfN4AoMYRjy/Tqz9tq8TSUqNcOTjlMR7D
  • Delivered-to: sumo-dev@xxxxxxxxxxx
  • List-archive: <https://www.eclipse.org/mailman/private/sumo-dev>
  • List-help: <mailto:sumo-dev-request@eclipse.org?subject=help>
  • List-subscribe: <https://www.eclipse.org/mailman/listinfo/sumo-dev>, <mailto:sumo-dev-request@eclipse.org?subject=subscribe>
  • List-unsubscribe: <https://www.eclipse.org/mailman/options/sumo-dev>, <mailto:sumo-dev-request@eclipse.org?subject=unsubscribe>
  • User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0
Hi Harald,
as long as you do not have changes you committed yourself to the master
branch it does not really matter. If you choose ff.only you are on the
safe side because it will always fail if you have made changes yourself.

Best regards,
Michael

Am 26.10.20 um 09:52 schrieb Harald Schaefer:
> Hi all,
> 
> after upgrading to Ubuntu 20.10 the command "git pull" gives a new message
> 
> harald@nyc> git pull
> warning: Es wird davon abgeraten zu Pullen, ohne anzugeben, wie mit
> abweichenden
> Branches umgegangen werden soll. Sie können diese Nachricht unterdrücken,
> indem Sie einen der folgenden Befehle ausführen, bevor der nächste Pull
> ausgeführt wird:
> 
>   git config pull.rebase false  # Merge (Standard-Strategie)
>   git config pull.rebase true   # Rebase
>   git config pull.ff only       # ausschließlich Vorspulen
> 
> Sie können statt "git config" auch "git config --global" nutzen, um
> einen Standard für alle Repositories festzulegen. Sie können auch die
> Option --rebase, --no-rebase oder --ff-only auf der Kommandozeile nutzen,
> um das konfigurierte Standardverhalten pro Aufruf zu überschreiben.
> 
> remote: Enumerating objects: 17, done.
> remote: Counting objects: 100% (17/17), done.
> remote: Compressing objects: 100% (12/12), done.
> remote: Total 12 (delta 10), reused 0 (delta 0), pack-reused 0
> Entpacke Objekte: 100% (12/12), 1.66 KiB | 54.00 KiB/s, Fertig.
> Von https://github.com/eclipse/sumo
>    46b1d9763e..79ce875def  master     -> origin/master
> Aktualisiere 46b1d9763e..79ce875def
> Fast-forward
>  docs/web/docs/Tutorials.md | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> Do you have recommendations for the SUMO repository?
> 
> Greetings, Harald
> 
> _______________________________________________
> sumo-dev mailing list
> sumo-dev@xxxxxxxxxxx
> To unsubscribe from this list, visit
> https://www.eclipse.org/mailman/listinfo/sumo-dev

Attachment: signature.asc
Description: OpenPGP digital signature

Back to the top