From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sat, 28 Mar 2015 15:52:07 -0400 Message-ID: References: <86egoeusg2.fsf@example.com> <87384qzxqy.fsf@igel.home> <83bnjen71r.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1427572360 20449 80.91.229.3 (28 Mar 2015 19:52:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 28 Mar 2015 19:52:40 +0000 (UTC) Cc: sva-news@mygooglest.com, schwab@suse.de, eliz@gnu.org, emacs-devel@gnu.org To: Richard Stallman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Mar 28 20:52:34 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 1YbwmW-0003if-G6 for ged-emacs-devel@m.gmane.org; Sat, 28 Mar 2015 20:52:32 +0100 Original-Received: from localhost ([::1]:55098 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbwmV-0007ON-Sm for ged-emacs-devel@m.gmane.org; Sat, 28 Mar 2015 15:52:31 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbwmI-0007OI-CO for emacs-devel@gnu.org; Sat, 28 Mar 2015 15:52:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YbwmH-0001aD-GS for emacs-devel@gnu.org; Sat, 28 Mar 2015 15:52:18 -0400 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:48055) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbwmC-0001Z5-0i; Sat, 28 Mar 2015 15:52:12 -0400 Original-Received: from ceviche.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id t2SJq8DA030252; Sat, 28 Mar 2015 15:52:08 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 804496610A; Sat, 28 Mar 2015 15:52:07 -0400 (EDT) In-Reply-To: (Richard Stallman's message of "Sat, 28 Mar 2015 12:15:59 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV5259=0 X-NAI-Spam-Version: 2.3.0.9393 : core <5259> : inlines <2542> : streams <1413151> : uri <1892607> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.20 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:184479 Archived-At: > I have not yet seen a definitive answer about whether git reset is a > reliable fix for that. I think it is, but it should be "git reset --soft HEAD^", which AFAIK is the way to spell "uncommit" in Git (where "uncommit" to me means to do just the reverse of commit, i.e. just like commit it shouldn't touch the files's contents, only the metadata). > Can the repository itself have a file that directs git to run a shell > command after pushing? Depends what you mean by "repository". Your local Git clone is a repository. So the hooks discussed here would indeed be placed in your repository. But I don't think there's a way to change Emacs's git.sv.gnu.org repository such that when you clone it, you automatically get such hooks. Stefan