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: VC mode and git Date: Sun, 05 Apr 2015 11:39:34 +0200 Message-ID: <552102D6.1030106@math.ntnu.no> References: <5511998E.8080309@cs.ucla.edu> <5512F8C7.7010509@math.ntnu.no> <5513F889.4000404@math.ntnu.no> 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 1428226809 30947 80.91.229.3 (5 Apr 2015 09:40:09 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 09:40:09 +0000 (UTC) Cc: eggert@cs.ucla.edu, 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 11:40:09 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 1Yeh2D-0007Hf-OX for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 11:40:05 +0200 Original-Received: from localhost ([::1]:35687 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yeh2C-0001fH-LR for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 05:40:04 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yeh20-0001f1-0e for emacs-devel@gnu.org; Sun, 05 Apr 2015 05:39:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yeh1w-0002sp-RS for emacs-devel@gnu.org; Sun, 05 Apr 2015 05:39:51 -0400 Original-Received: from hylle05.itea.ntnu.no ([129.241.56.225]:35541) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yeh1w-0002sK-KX; Sun, 05 Apr 2015 05:39:48 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle05.itea.ntnu.no (Postfix) with ESMTP id C8D6290D3BC; Sun, 5 Apr 2015 11:39:37 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle05.itea.ntnu.no Original-Received: from [IPv6:2001:4662:4ffb::6c00:a298:a5fc:6f32] (unknown [IPv6:2001:4662:4ffb:0:6c00:a298:a5fc:6f32]) (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 C27BF90D3B6; Sun, 5 Apr 2015 11:39:36 +0200 (CEST) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 129.241.56.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:184909 Archived-At: Richard Stallman wrote: > You had recommended > > git add lisp/ChangeLog > git commit > > so I tried that. git add completed with no output. > git commit showed me a monster list of files with > changes to be committed, and asked me for the log message. > I killed it. > > What next? That monster list of files is expected. If I am right, it reflects the=20 changes made to origin/master, that is the central repository, *relative=20 to your local master branch*. So go ahead and commit. Give it a random commit message if you wish. I promise you, you can back out of this if needed. I'll tell you how=20 below, in fact. Next, run: git diff origin/master If I am right, you will see the changes you made, and nothing else. If so, fix up your commit message to something more reasonable with git=20 commit --amend, and you're good to go. Assuming this is so, you will have fallen behind the central repo, so=20 you need once more to do git pull # fix conflicts, if any git push and your're done. Assuming you're still concerned because the output of that git diff=20 command is not what you expected, here is what to do: git branch wtf That will create a new branch named =E2=80=9Cwtf=E2=80=9D (you can call i= t something=20 less offensive if you wish) to use for further diagnostics and recovery=20 efforts. It will be identical to your now current master branch. Then git reset --hard master^ That will reset the master branch right back where you had it before the=20 last commit, but it will now be in a clean state. All the changes that=20 were in your index and working tree are still in the =E2=80=9Cwtf=E2=80=9D= branch. At=20 this point, ask for further help. I am going to suggest, if it comes to=20 this, that you push the =E2=80=9Cwtf=E2=80=9D branch to a temporary branc= h on the=20 central repo so that more eyeballs can get on the case and make an=20 accurate diagnosis. =E2=80=93 Harald