From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii 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 22:03:18 +0300 Message-ID: <83v9hih0qx.fsf@gnu.org> References: <20200816182558.16607.52991@vcs0.savannah.gnu.org> <20200816182601.16F2A209AC@vcs0.savannah.gnu.org> <87imdisam3.fsf@gnus.org> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="33684"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Lars Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Aug 16 21:04:19 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 1k7Nx4-0008dg-Ca for ged-emacs-devel@m.gmane-mx.org; Sun, 16 Aug 2020 21:04:18 +0200 Original-Received: from localhost ([::1]:55908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7Nx3-0006YE-7Y for ged-emacs-devel@m.gmane-mx.org; Sun, 16 Aug 2020 15:04:17 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:58178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7NwO-00068u-3A for emacs-devel@gnu.org; Sun, 16 Aug 2020 15:03:36 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:42795) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7NwN-0001lB-PV; Sun, 16 Aug 2020 15:03:35 -0400 Original-Received: from [176.228.60.248] (port=2682 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1k7NwN-0007Kw-2I; Sun, 16 Aug 2020 15:03:35 -0400 In-Reply-To: <87imdisam3.fsf@gnus.org> (message from Lars Ingebrigtsen on Sun, 16 Aug 2020 20:34:44 +0200) 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:253860 Archived-At: > From: Lars Ingebrigtsen > Date: Sun, 16 Aug 2020 20:34:44 +0200 > > larsi@gnus.org (Lars Ingebrigtsen) writes: > > > branch: master > > commit bdda935a7d9519b71822270cf98328ae236b257d > > Merge: ada0b9b df2ae3f > > Author: Lars Ingebrigtsen > > Commit: Lars Ingebrigtsen > > > > Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs > > Eep! What did I do? Probably "git pull" after committing, but before pushing that commit. > This was from my OpenBSD installation, and I forgot to install my > .gitconfig file there. > > 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.