From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: git apologia Date: Sun, 16 Nov 2014 19:20:51 +0100 Message-ID: <87ppcnvwfw.fsf@igel.home> 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> <87y4rbw19i.fsf@igel.home> <83vbmfc99m.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416162082 30670 80.91.229.3 (16 Nov 2014 18:21:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 16 Nov 2014 18:21:22 +0000 (UTC) Cc: stephen@xemacs.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 16 19:21:14 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 1Xq4Rl-0002wK-JM for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 19:21:13 +0100 Original-Received: from localhost ([::1]:44697 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq4Rl-0001Ar-6k for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 13:21:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41255) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq4Rd-0001AN-G0 for emacs-devel@gnu.org; Sun, 16 Nov 2014 13:21:10 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xq4RY-0002NS-L8 for emacs-devel@gnu.org; Sun, 16 Nov 2014 13:21:05 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:33709) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq4RT-0002Mm-4f; Sun, 16 Nov 2014 13:20:55 -0500 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3jghYd04D2z3hjDN; Sun, 16 Nov 2014 19:20:52 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3jghYc5GJZzvh1h; Sun, 16 Nov 2014 19:20:52 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id 5I8FubK7pnkr; Sun, 16 Nov 2014 19:20:51 +0100 (CET) X-Auth-Info: hxjgrD3P7R8Iq1SYeV6j8X1Jly+YWlGFwVA7ObgDKJ5RCGSlcky2xg8aaiHGsVmz Original-Received: from igel.home (ppp-188-174-153-251.dynamic.mnet-online.de [188.174.153.251]) by mail.mnet-online.de (Postfix) with ESMTPA; Sun, 16 Nov 2014 19:20:51 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id 98A562C2492; Sun, 16 Nov 2014 19:20:51 +0100 (CET) X-Yow: This TOPS OFF my partygoing experience! Someone I DON'T LIKE is talking to me about a HEART-WARMING European film.. In-Reply-To: <83vbmfc99m.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 16 Nov 2014 20:04:05 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 212.18.0.9 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:177338 Archived-At: Eli Zaretskii writes: >> From: Andreas Schwab >> Cc: "Stephen J. Turnbull" , emacs-devel@gnu.org >> Date: Sun, 16 Nov 2014 17:36:41 +0100 >> >> Eli Zaretskii writes: >> >> > Actually, it turns out neither this nor HEAD~n is what I want. What I >> > want is to display information about commits N..M where N and M are >> > ordinal numbers from the linear "git log" output. And waddaya know? >> > HEAD~n etc. seem to _skip_ merge-commits, >> >> Just like bzr does with its ordinal numbers. > > No, bzr shows the merge-commit on the mainline, with a normal > (i.e. non-dotted) number. Only the commits on the branch from which > we merged are skipped by default by "bzr log". And how is that different from the counting of HEAD~n? Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."