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: Stash Date: Mon, 06 Apr 2015 09:55:17 +0300 Message-ID: <83k2xplp9m.fsf@gnu.org> References: <86sice77h0.fsf@dod.no> <86fv8d7ntk.fsf@dod.no> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428303370 21760 80.91.229.3 (6 Apr 2015 06:56:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 6 Apr 2015 06:56:10 +0000 (UTC) Cc: emacs-devel@gnu.org To: Steinar Bang , Richard Stallman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 06 08:56:00 2015 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 1Yf0wt-0004vR-Ef for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 08:55:55 +0200 Original-Received: from localhost ([::1]:38686 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf0ws-0005dB-So for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 02:55:54 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf0wE-0004zP-TB for emacs-devel@gnu.org; Mon, 06 Apr 2015 02:55:16 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yf0wE-0000cr-0A for emacs-devel@gnu.org; Mon, 06 Apr 2015 02:55:14 -0400 Original-Received: from mtaout24.012.net.il ([80.179.55.180]:44548) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf0wD-0000b6-Ob; Mon, 06 Apr 2015 02:55:13 -0400 Original-Received: from conversion-daemon.mtaout24.012.net.il by mtaout24.012.net.il (HyperSendmail v2007.08) id <0NMD00K00HEGKI00@mtaout24.012.net.il>; Mon, 06 Apr 2015 09:46:45 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout24.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NMD00F2RHHXLP50@mtaout24.012.net.il>; Mon, 06 Apr 2015 09:46:45 +0300 (IDT) In-reply-to: <86fv8d7ntk.fsf@dod.no> 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:185005 Archived-At: > From: Steinar Bang > Date: Mon, 06 Apr 2015 08:50:15 +0200 > > >>>>> Richard Stallman : > > > I did > > >> git reset --hard HEAD > > > since I had installed all my changes. > > Then I did 'git pull' and it reported a lot of things. > > Then I did 'git status' which produced this: > > > # On branch master > > # Your branch is ahead of 'origin/master' by 2 commits. > > # > > nothing to commit (working directory clean) > > > What does that second line "ahead of" mean? > > It means that the branch master has two commits that aren't in > origin/master (which is your local copy of what's on savannah). > > > Is it a problem? > > I don't think so. I think they are probably artifacts of two of the > pull commands done, so I think you probably won't need them. > > The following is a way to remove the two commits from master in your git > repository Perhaps it would be better to look at those two commits first? I think the following command will accomplish that: git diff origin/master