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: Thu, 26 Mar 2015 12:24:01 +0100 Message-ID: <5513EC51.2060600@math.ntnu.no> References: <5511998E.8080309@cs.ucla.edu> <5512F8C7.7010509@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 1427369059 30008 80.91.229.3 (26 Mar 2015 11:24:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 26 Mar 2015 11:24:19 +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 Thu Mar 26 12:24:18 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 1Yb5tV-0008Je-Fb for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 12:24:13 +0100 Original-Received: from localhost ([::1]:43900 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb5tU-0001HW-ML for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 07:24:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36037) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb5tQ-0001HR-EP for emacs-devel@gnu.org; Thu, 26 Mar 2015 07:24:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yb5tN-0006NH-Ni for emacs-devel@gnu.org; Thu, 26 Mar 2015 07:24:08 -0400 Original-Received: from hylle05.itea.ntnu.no ([129.241.56.225]:33040) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb5tN-0006NB-GU; Thu, 26 Mar 2015 07:24:05 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle05.itea.ntnu.no (Postfix) with ESMTP id AABE190CD28; Thu, 26 Mar 2015 12:24:04 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at hylle05.itea.ntnu.no Original-Received: from [IPv6:2001:700:300:1470:789b:1233:a9df:9367] (unknown [IPv6:2001:700:300:1470:789b:1233:a9df:9367]) (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 148E890CD2B; Thu, 26 Mar 2015 12:24:04 +0100 (CET) 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:184310 Archived-At: Richard Stallman wrote: > > It is also useful to know if you have any local commits. Assuming= you > > are on the master branch, you can run > > > git log origin/master..master > > Here's the output I got from that. > [=E2=80=A6] Okay, so you have done some local commits. That complicates things=20 somewhat, but not hopelessly so. It is essential knowledge for proper=20 recovery, though. =E2=80=93 Harald