From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs Date: Sun, 16 Aug 2020 21:13:36 +0200 Message-ID: <87y2mequ8v.fsf@gnus.org> References: <20200816182558.16607.52991@vcs0.savannah.gnu.org> <20200816182601.16F2A209AC@vcs0.savannah.gnu.org> <87imdisam3.fsf@gnus.org> <83v9hih0qx.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="35398"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Aug 16 21:14:18 2020 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1k7O6j-00096E-CQ for ged-emacs-devel@m.gmane-mx.org; Sun, 16 Aug 2020 21:14:17 +0200 Original-Received: from localhost ([::1]:59632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7O6i-0000s0-F2 for ged-emacs-devel@m.gmane-mx.org; Sun, 16 Aug 2020 15:14:16 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:59414) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7O6C-0000Om-Ox for emacs-devel@gnu.org; Sun, 16 Aug 2020 15:13:44 -0400 Original-Received: from quimby.gnus.org ([2a01:4f9:2b:f0f::2]:58458) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7O6A-0002yf-QQ; Sun, 16 Aug 2020 15:13:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=4ExGQCkQmhfuKow6jlOeM3RNWTnxwbzdePzAFTjkUq8=; b=s02TY2z/hxoMa94cKTBf2g9dz6 +ZEZKinzPj4+B4a3xY9HcDy5X1T4p9DzM6PZCIJIP9Qz8C9WOEuCx5Tumq/tG+rxzvEgeS/ogX/Af zk8lD8cwLlx8ze/bo72LKSmvbfsyJSYa5pTiI6EJLRGuzRbOwN6wFtDs6RsiHRn2wTyk=; Original-Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=xo) by quimby with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1k7O65-0007ko-JO; Sun, 16 Aug 2020 21:13:40 +0200 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAGFBMVEVRNC6Yb0O+l1vR qGXey6f54qhubYb///+LjyObAAAAAWJLR0QHFmGI6wAAAAd0SU1FB+QIEBMNDfQX8LMAAAGzSURB VDjLbdNBktsgEAVQnFT2A072oZlkLxodwAIdwBZcYFI19z9CfgOSJXl6pfJz098yrZQhRoVS8udY ai3Mb0opjSJN7+WhfjUYjOlgiMgBfqxwFbhog6PIpZv6zrUG3TscR4g8H0oawheAk0JKzP4VHHMK PPGgvhF55KA+wwWMiNO8rHGLZ1s7opzlxycQa4HgEdH5Z8dEUQChcBTvwF+XDpJ3KhuQ3sDjhzzh ph8ABUgewZ6Q7QZo+lt2cTvg6zF+7uFu64wxRV4+XoA4RXLx3w54EHAADvhXz4DZKAmzgSMrs5O8 qrLvcDRUwOfhANfekdBzAGtWSCfQHfgEQwUX8rnjrr0A87njIak0zRGJX8HQWHI5dchl0CR3PM/H DnvBRaxweFd30hdlEGsuOXwB9TbwEXCUsSSBed7BrQI1GFeQS4P7q2SffG1psLTl8UjVAc8N2o3H Uaad5Vn/lEVhqqXaatZB2F2sRgOr2jLL1ubWt4GRw8i9N6AObxLXytOfnLlXbVBtAmANWsVq1T/H O45H6B12LpPVNTfWjvQK1qY0yEK2km1GJhluUvp92P//rK3ZjhWSbMIAAAAldEVYdGRhdGU6Y3Jl YXRlADIwMjAtMDgtMTZUMTk6MTM6MTMrMDA6MDAca0yOAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDIw LTA4LTE2VDE5OjEzOjEzKzAwOjAwbTb0MgAAAABJRU5ErkJggg== X-Now-Playing: Kate Bush's _Aerial (2)_: "Nocturn" In-Reply-To: <83v9hih0qx.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 16 Aug 2020 22:03:18 +0300") Received-SPF: pass client-ip=2a01:4f9:2b:f0f::2; envelope-from=larsi@gnus.org; helo=quimby.gnus.org X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 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-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:253861 Archived-At: Eli Zaretskii writes: >> Did I mess anything up badly? > > No, it happens all the time, and we don't bother noticing. Look at > the result of "git log --graph", and you will see it's okay, looks > like a merge from a branch. *phew* Thanks. :-) -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no