From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jean Louis Newsgroups: gmane.emacs.devel Subject: Re: Integration of dictionary package Date: Fri, 20 Nov 2020 04:41:08 +0300 Message-ID: References: <87o8k7zxoj.fsf@gmail.com> <494a350b-e2ac-5497-3336-61358517a102@hilbrich.tk> <4c83392f-9874-0047-0901-a02b6a84c2e8@hilbrich.tk> <83d009143y.fsf@gnu.org> <838sax13d5.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="3825"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mutt/2.0 (3d08634) (2020-11-07) Cc: emacs.nolkaf@hilbrich.tk, orontee@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri Nov 20 03:16:23 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 1kfvyJ-0000u2-B4 for ged-emacs-devel@m.gmane-mx.org; Fri, 20 Nov 2020 03:16:23 +0100 Original-Received: from localhost ([::1]:44178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfvyI-00004q-AY for ged-emacs-devel@m.gmane-mx.org; Thu, 19 Nov 2020 21:16:22 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50570) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfvxJ-0007cP-Dl for emacs-devel@gnu.org; Thu, 19 Nov 2020 21:15:21 -0500 Original-Received: from static.rcdrun.com ([95.85.24.50]:43975) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfvxH-0004Se-EN; Thu, 19 Nov 2020 21:15:21 -0500 Original-Received: from localhost ([::ffff:41.202.241.56]) (AUTH: PLAIN admin, TLS: TLS1.2,256bits,ECDHE_RSA_AES_256_GCM_SHA384) by static.rcdrun.com with ESMTPSA id 00000000002C0013.000000005FB726B4.0000569B; Fri, 20 Nov 2020 02:15:15 +0000 Content-Disposition: inline In-Reply-To: <838sax13d5.fsf@gnu.org> Received-SPF: pass client-ip=95.85.24.50; envelope-from=bugs@gnu.support; helo=static.rcdrun.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-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:259458 Archived-At: * Eli Zaretskii [2020-11-19 23:47]: > > Date: Thu, 19 Nov 2020 23:39:58 +0300 > > From: Jean Louis > > Cc: emacs.nolkaf@hilbrich.tk, orontee@gmail.com, emacs-devel@gnu.org > > > > I did: > > > > git reset -hard master > > > > git checkout -b feature/integration-of-dictionary-el > > > > git pull origin feature/integration-of-dictionary-el > > I think instead of the last command you needed to do just "git pull". I have tried, then it said I had to be explicit with the branch. git checkout feature/integration-of-dictionary-el Switched to branch 'feature/integration-of-dictionary-el' ~/Programming/Software/emacs $ git pull There is no tracking information for the current branch. Please specify which branch you want to merge with. See git-pull(1) for details. git pull If you wish to set tracking information for this branch you can do so with: git branch --set-upstream-to=origin/ feature/integration-of-dictionary-el