emacs-devel
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/s

From: David De La Harpe Golden
Subject: Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
Date: Mon, 17 Aug 2020 21:05:41 +0100
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0
maybe I'm paranoid but in general using git, I tend to only do "git pull --ff-only" (or rather, I default to it in my .gitconfig) and if that errors out I always just fall back to a git fetch / <inspect situation> / git merge, see also e.g. 

https://blog.sffc.xyz/post/185195398930/why-you-should-use-git-pull-ff-only
reply via email to
[Prev in Thread] Current Thread [Next in Thread]