From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: master c6f03ed: Fix a problem in url.el without GnuTLS Date: Sun, 14 Dec 2014 00:00:15 +0200 Message-ID: <86ppbn1a8g.fsf@yandex.ru> 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> <838uib60jv.fsf@gnu.org> <87mw6rpc6l.fsf@engster.org> <83sigj48z5.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1418508064 21053 80.91.229.3 (13 Dec 2014 22:01:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 13 Dec 2014 22:01:04 +0000 (UTC) Cc: David Engster , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 13 23:00:54 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 1Xzuk8-0002yc-4j for ged-emacs-devel@m.gmane.org; Sat, 13 Dec 2014 23:00:52 +0100 Original-Received: from localhost ([::1]:34381 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xzuk7-0005RW-LD for ged-emacs-devel@m.gmane.org; Sat, 13 Dec 2014 17:00:51 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52991) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xzujj-0005RO-Q1 for emacs-devel@gnu.org; Sat, 13 Dec 2014 17:00:33 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xzuje-0003GC-0X for emacs-devel@gnu.org; Sat, 13 Dec 2014 17:00:27 -0500 Original-Received: from mail-wi0-x22c.google.com ([2a00:1450:400c:c05::22c]:53004) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xzujd-0003G3-P0; Sat, 13 Dec 2014 17:00:21 -0500 Original-Received: by mail-wi0-f172.google.com with SMTP id n3so5607935wiv.5; Sat, 13 Dec 2014 14:00:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=HmZlTqxapnPtfYlvAoUu8OjuQXfcs7gOQLkcigS7psk=; b=EqvUyopTQJEXZtPUxnpeze6f5gq2eIaoxoPNzS5T0swyjEL5j5l2KfJDuNJaLHNgEF q19ALwbcp74W6OJk6Zufsce4CE+E2Sm5xzougAVlcHyam6NB8HK4+ABO1g/MDF2ePul8 U8EAkL5uor/lZefMOMh3PHTcTRwGluf7QNoAAW9QZnuV0Dn2mP26+kve6dWfL4/eVALi lkQ6zZW8lQkk2WFpPHj24B632ScVuKd/OFJVh9GEtVKrgIubptTqGFuSJS5+1ERXiAO2 KUUMJH3kldmLVZpEBr2Dku532cAntwZaJ1PUsCnk+Rxj/N1FKb6gHsjekjHY8tj+FpuL qnsQ== X-Received: by 10.180.108.235 with SMTP id hn11mr18636803wib.14.1418508021063; Sat, 13 Dec 2014 14:00:21 -0800 (PST) Original-Received: from axl ([82.102.93.58]) by mx.google.com with ESMTPSA id n5sm7179996wic.6.2014.12.13.14.00.18 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 13 Dec 2014 14:00:20 -0800 (PST) In-Reply-To: <83sigj48z5.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 13 Dec 2014 21:59:10 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.51 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::22c 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:180041 Archived-At: Eli Zaretskii writes: >> When you rebase a commit, it becomes a new one. Therefore, you can only >> safely rebase "local" commits (meaning: commits only *you* have). > > If "safely" here means "while preserving the commit's sha1", then it's > quite obvious. Rebasing *never* preserves a commit's SHA. So basically, you always get a set of new commits that look very much like the old ones. > at all, even when rebase=preserve was/is used? What rebase=preserve does, is "pass --preserve-merges along to git rebase so that locally created merge commits will not be flattened" (quoting the 'git pull' man page).