From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Harald Hanche-Olsen Newsgroups: gmane.emacs.devel Subject: Re: Stash Date: Sun, 05 Apr 2015 21:41:27 +0200 Message-ID: <55218FE7.1060600@math.ntnu.no> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1428262909 4109 80.91.229.3 (5 Apr 2015 19:41:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 19:41:49 +0000 (UTC) Cc: emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 21:41:48 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 1YeqQV-0007DE-7l for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 21:41:47 +0200 Original-Received: from localhost ([::1]:37410 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeqQU-0005OK-BV for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 15:41:46 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeqQG-0005ND-GJ for emacs-devel@gnu.org; Sun, 05 Apr 2015 15:41:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeqQF-0006u7-Oy for emacs-devel@gnu.org; Sun, 05 Apr 2015 15:41:32 -0400 Original-Received: from hylle05.itea.ntnu.no ([2001:700:300:3::225]:40753) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeqQF-0006tp-Hf; Sun, 05 Apr 2015 15:41:31 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle05.itea.ntnu.no (Postfix) with ESMTP id 51527901372; Sun, 5 Apr 2015 21:41:29 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle05.itea.ntnu.no Original-Received: from [IPv6:2001:4662:4ffb::9c03:cb99:4344:82bc] (unknown [IPv6:2001:4662:4ffb:0:9c03:cb99:4344:82bc]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: hanche) by hylle05.itea.ntnu.no (Postfix) with ESMTPSA id 9CDFB9010D5; Sun, 5 Apr 2015 21:41:28 +0200 (CEST) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:700:300:3::225 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:184973 Archived-At: Richard Stallman wrote: > I don't have all the output. I had run git in a shell buffer a few > times, and it causes a lot of trouble about the terminal. So I started > running it in an ordinary terminal. To fix that, arrange set the environment variable GIT_PAGER to the empty=20 string in the shell buffer. Or create an alias to run =E2=80=9Cgit --no-p= ager=E2=80=9D=20 instead of git. > Fortunately it seems that all my changes did make it into Savannah. > So it is just a matter of how to get a clean repository. If =E2=80=9Cgit status -s=E2=80=9D produces no output, I see no reason no= t to run git reset --hard origin/master If it does produce output, you could do git commit -a -m 'Commited just in case' git branch badmaster HEAD git reset --hard origin/master Now everything in your repository should be just fine, except you might=20 have some junk in the badmaster branch. (That was just in case there was=20 important information there that you did not want to lose. If some time=20 passes and you're confident you haven't lost anything, delete the=20 badmaster branch.) =E2=80=93 Harald