From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: master c6f03ed: Fix a problem in url.el without GnuTLS Date: Sat, 13 Dec 2014 17:18:12 +0200 Message-ID: <838uib60jv.fsf@gnu.org> References: <20141211155740.11916.1584@vcs.savannah.gnu.org> <87ppbquo97.fsf@gmail.com> <83zjaurreb.fsf@gnu.org> <874mt14wrc.fsf@lifelogs.com> <83egs5rzlr.fsf@gnu.org> <877fxx2e6t.fsf@lifelogs.com> <83a92trlgs.fsf@gnu.org> <87oar81jlp.fsf@lifelogs.com> <87bnn7rkcq.fsf@engster.org> <877fxvri96.fsf@engster.org> <87zjarznzs.fsf@lifelogs.com> <87sigjpri2.fsf@engster.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1418483934 26395 80.91.229.3 (13 Dec 2014 15:18:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 13 Dec 2014 15:18:54 +0000 (UTC) Cc: emacs-devel@gnu.org To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 13 16:18:47 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XzoT0-0007iS-Ma for ged-emacs-devel@m.gmane.org; Sat, 13 Dec 2014 16:18:46 +0100 Original-Received: from localhost ([::1]:33416 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzoSz-0007Qc-OG for ged-emacs-devel@m.gmane.org; Sat, 13 Dec 2014 10:18:45 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53467) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzoSg-0007PP-6k for emacs-devel@gnu.org; Sat, 13 Dec 2014 10:18:32 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XzoSa-0003or-45 for emacs-devel@gnu.org; Sat, 13 Dec 2014 10:18:26 -0500 Original-Received: from mtaout24.012.net.il ([80.179.55.180]:40695) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzoSZ-0003oj-SI for emacs-devel@gnu.org; Sat, 13 Dec 2014 10:18:20 -0500 Original-Received: from conversion-daemon.mtaout24.012.net.il by mtaout24.012.net.il (HyperSendmail v2007.08) id <0NGJ00E000AIGZ00@mtaout24.012.net.il> for emacs-devel@gnu.org; Sat, 13 Dec 2014 17:10:30 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout24.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NGJ00F1Q0TIB410@mtaout24.012.net.il>; Sat, 13 Dec 2014 17:10:30 +0200 (IST) In-reply-to: <87sigjpri2.fsf@engster.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.180 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:180009 Archived-At: > From: David Engster > Date: Sat, 13 Dec 2014 15:13:25 +0100 > > Never rebase commits that are upstream. Rebasing will always create new > commits (in case if you wondering, 'pull --rebase=preserve' doesn't > change that; it will keep a merge commit, but that will not merge > origin/emacs-24 anymore but a new set of commits). English, please: what does that mean? The documentation seems to suggest that "pull --rebase=preserve" is exactly the right thing in this situation. > Instead, simply merge master into your tree. Despite what others may > say, this is still a perfectly valid thing to do in Git. :-) This what > 'git pull' will do by default (unless you configured it otherwise). Yes, but then my commits will appear as merge-commits, won't they?