From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: git apologia Date: Mon, 17 Nov 2014 17:57:12 +0100 Organization: Organization?!? Message-ID: <87389hkbo7.fsf@fencepost.gnu.org> References: <20141114183737.GB3168@acm.acm> <5466517B.50705@porkrind.org> <20141114215404.GD3168@acm.acm> <838ujchods.fsf@gnu.org> <8761egx1k2.fsf@uwakimon.sk.tsukuba.ac.jp> <83sihkg2ds.fsf@gnu.org> <87vbmgv3b9.fsf@uwakimon.sk.tsukuba.ac.jp> <83389jdtae.fsf@gnu.org> <87k32uvg2x.fsf@uwakimon.sk.tsukuba.ac.jp> <83ioidbwz5.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416244218 26795 80.91.229.3 (17 Nov 2014 17:10:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 17 Nov 2014 17:10:18 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 17 18:10:11 2014 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 1XqPoY-0004u6-V3 for ged-emacs-devel@m.gmane.org; Mon, 17 Nov 2014 18:10:11 +0100 Original-Received: from localhost ([::1]:49111 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqPoY-0005PQ-Bd for ged-emacs-devel@m.gmane.org; Mon, 17 Nov 2014 12:10:10 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36047) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqPex-0006OT-5N for emacs-devel@gnu.org; Mon, 17 Nov 2014 12:00:21 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqPeq-000332-PE for emacs-devel@gnu.org; Mon, 17 Nov 2014 12:00:15 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:44670) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqPeq-00032q-JZ for emacs-devel@gnu.org; Mon, 17 Nov 2014 12:00:08 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XqPem-0007Nu-53 for emacs-devel@gnu.org; Mon, 17 Nov 2014 18:00:04 +0100 Original-Received: from x2f41f1e.dyn.telefonica.de ([2.244.31.30]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 17 Nov 2014 18:00:04 +0100 Original-Received: from dak by x2f41f1e.dyn.telefonica.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 17 Nov 2014 18:00:04 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 39 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: x2f41f1e.dyn.telefonica.de X-Face: 2FEFf>]>q>2iw=B6, xrUubRI>pR&Ml9=ao@P@i)L:\urd*t9M~y1^:+Y]'C0~{mAl`oQuAl \!3KEIp?*w`|bL5qr,H)LFO6Q=qx~iH4DN; i"; /yuIsqbLLCh/!U#X[S~(5eZ41to5f%E@'ELIi$t^ Vc\LWP@J5p^rst0+('>Er0=^1{]M9!p?&:\z]|;&=NP3AhB!B_bi^]Pfkw User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:6VDn+OTQs1l3dUbBzZRQEyoihS0= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:177452 Archived-At: Eli Zaretskii writes: >> From: "Stephen J. Turnbull" >> Cc: emacs-devel@gnu.org >> Date: Mon, 17 Nov 2014 09:14:14 +0900 >> >> > And waddaya know? HEAD~n etc. seem to _skip_ merge-commits, >> >> It only seems to do so. In my (not quite up-to-date) emacs repo, >> "git log @address@hidden" displays no merges, but apparently that's because >> there's a long sequence of non-merges (fast-forwards) on mainline. >> However, "git log @~10..@" displays several, as does >> "git log @address@hidden". >> >> Or by "merge-commits" do you mean the off-trunk commits? > > Yes, it turns out that's what they were, as Andreas pointed out. I > was fooled by the fact that they are shown by default (unlike what I'm > used to with bzr), and they seem to have no visual cues in the default > output format that they are off-trunk (like, e.g., the indentation > used by "bzr log"). git log --graph > I will probably convince myself to add --first-parent to my "git log" > aliases, as Andreas suggested. After all, that's what "bzr log" does > by default. Then HEAD~n will work as I expect. (And don't get me > started on the reader-unfriendly description of --first-parent on the > git-log man page.) > > Or maybe I will start using "C-x v L" ;-) No need for a smilie. VC is supposed to provide unifying workflows, and Git is supposed to be flexible enough for a variety of workflows. Making use of preexisting work for matching Git to workflows you are more comfortable with is pretty much what VC is about. -- David Kastrup