From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Caldwell Newsgroups: gmane.emacs.devel Subject: Re: Obscure error/warning/information message from git pull Date: Fri, 14 Nov 2014 15:40:47 -0800 Message-ID: <546692FF.50800@porkrind.org> References: <20141114120604.GA3859@acm.acm> <87389mkjwo.fsf@thinkpad-t440p.tsdh.org> <20141114141434.GM3565@embecosm.com> <20141114180521.GA3168@acm.acm> <20141114230235.GF3168@acm.acm> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms020902090302080902040208" X-Trace: ger.gmane.org 1416008481 9222 80.91.229.3 (14 Nov 2014 23:41:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 14 Nov 2014 23:41:21 +0000 (UTC) Cc: emacs-devel@gnu.org To: Alan Mackenzie , Sergey Organov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 00:41:15 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 1XpQUN-0005ze-95 for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 00:41:15 +0100 Original-Received: from localhost ([::1]:38184 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpQUM-0007rr-Me for ged-emacs-devel@m.gmane.org; Fri, 14 Nov 2014 18:41:14 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37598) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpQUD-0007rJ-LI for emacs-devel@gnu.org; Fri, 14 Nov 2014 18:41:10 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpQU8-0008AI-Au for emacs-devel@gnu.org; Fri, 14 Nov 2014 18:41:05 -0500 Original-Received: from sa38.galvanix.net ([98.126.48.38]:35490 helo=kill.porkrind.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpQU8-0008A4-0c for emacs-devel@gnu.org; Fri, 14 Nov 2014 18:41:00 -0500 Original-Received: from porkrind.org (cpe-76-170-36-134.socal.res.rr.com [76.170.36.134]) by kill.porkrind.org (Postfix) with ESMTPS id 2B2376226A; Fri, 14 Nov 2014 15:40:52 -0800 (PST) Authentication-Results: kill.porkrind.org; dkim=pass reason="1536-bit key; unprotected key" header.d=porkrind.org header.i=@porkrind.org header.b=LSYzwCFy; dkim-adsp=pass; dkim-atps=neutral Original-Received: from [10.0.0.10] (black.local [10.0.0.10]) (authenticated bits=0) by porkrind.org (8.14.4/8.14.4/Debian-8) with ESMTP id sAENemNB020031 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Fri, 14 Nov 2014 15:40:48 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=porkrind.org; s=apoptygma; t=1416008448; bh=H49CmvCvMvpt3jaWiJ7To7JQJTJAOA51SP0A3ZTCY9Q=; h=Date:From:To:CC:Subject:References:In-Reply-To:From; b=LSYzwCFyxZTNUtNWc5dw/bBtlzaqw3RcW2gDx0LSMwZSfsvb3oCTVKll8CKqAeT5k U0+7xi6srTiv3+bkcXJ45f+6h7RkbWAPW2FjGT8/ohzkRpKPFTwMh402QIasbvvwyB MBJ9cblXoFEW9KjTyXmBXMN3aG5ou0fKxgvWkvQxeMRm50ZcMs26hiGX3p02QZcJOv 0u6FY6RW5YLglUUrhffQMI89JyFlyNQIIibXchTsHVnOTuHaPUwS+7HsVTb User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:33.0) Gecko/20100101 Thunderbird/33.0 In-Reply-To: <20141114230235.GF3168@acm.acm> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAQAAAD9CzEMAAAACXBIWXMAAAsTAAALEwEAmpwY AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+S X8VGAAABiklEQVR42rRYSZIDIQwzLv7/ZXLoEAzeBKG7ag4DRhZeBKQ0Qr5imLWCrKwn0HImc1Mx aAvmmc/cuAT7RMYws6v/gHeb0p4/y5792GJJlLZWOPgsdV5NaRes4Xe4632sLljD7wKv1Ta74H/h MxecN1Rc2TatYcP7zb+6WFfN/zMSHg1Ymuxjrzd+DuLw6Nlekggt1hvr7KK9tRIX85jjM6GTYhfv nzXH3jBdYc4koueBs66M+Xv9O9n5ML4urWssjGeMY3if3bzGSvk30BQ46OOaxJjLCpzPJAzXrOrD z5VFh58TIiwESIiCHNxxwPTy97qDei8YdpVdyYEv6EQcK8n+iTyE/Cn1eoe7HwN+F56oErVSGtJY Q1sR2ehaUHfjvJuv0tL7qAzEbBmfF2IHrVi8zp9N0pZtQZZHOXp/sLW4+hqKvm3iccaPwP3XgnKX n8/YtVeOsnenRG7VCBFlZ5fe3LOyANCVdGAIwDs7tTXGF4hIk15/iAfSgv2UkNFItSszOG3Ha7r0 GQBerhBkHOAzmQAAAABJRU5ErkJggg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 98.126.48.38 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:177132 Archived-At: This is a cryptographically signed message in MIME format. --------------ms020902090302080902040208 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 11/14/14 3:02 PM, Alan Mackenzie wrote: > I want to see all recent commits together, each one annotated with > which branch it's on. That's surely not too much to ask for. I want > annotation, not filtering. Git really doesn't have that exact feature (as far as I know). You can get something similar with "git log --all --graph --decorate=3Dfull" whic= h will show you the graph so you can see which commits end up on what branches. I find the graph format is better seen with "--oneline", but it works with more verbose log formats (including -p). Again, it might be worth you time trying to get tig[1] or gitk to work on your system=E2=80=94they both have nice visualizations of the repo dag= =2E -David [1] http://jonas.nitro.dk/tig/ A screenshot comparing the graphs of tig and gitk: http://jonas.nitro.dk/tig/screenshots/rev-graph.png --------------ms020902090302080902040208 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIMYDCC BiQwggUMoAMCAQICAwkFtDANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UEBhMCSUwxFjAUBgNV BAoTDVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRl IFNpZ25pbmcxODA2BgNVBAMTL1N0YXJ0Q29tIENsYXNzIDEgUHJpbWFyeSBJbnRlcm1lZGlh dGUgQ2xpZW50IENBMB4XDTE0MDIxODEwNDcxNFoXDTE1MDIxOTEyNTQzNVowQDEbMBkGA1UE AwwSZGF2aWRAcG9ya3JpbmQub3JnMSEwHwYJKoZIhvcNAQkBFhJkYXZpZEBwb3JrcmluZC5v cmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkzgZ2USy/IIF69iMaP5dgxFrN n/ppK9+HRpKWsesQ71tTX9+CqObNny15tzbNgORggsM5vVB7EdyNOfwhu2ZUn48MVSKnKnIM LmQPJNlYLbSDM33Q+2amNgoWxyvv3lpP44hXDB0Tftwu+0GMagvxKN2kpgVj5PvCai0NAhtR LZO6pspCTocquiYRovB2gDXq5wUFAU02lvlIgNFSV5QhHMHrAssy2qwU3/aoA9ibRpvSTFes LtawCR1zdqOo/wUrYfXT/XdTWYHXpNSFPNSeoPNoU08/jbH/077fdOLXXDN/NMU5dbWXkveS 4qQHWI0Zmgxj2oYfIOrM9SpcbYNTAgMBAAGjggLYMIIC1DAJBgNVHRMEAjAAMAsGA1UdDwQE AwIEsDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwHQYDVR0OBBYEFOd0ivfp8yzr VKmctRAtCmk9fMCHMB8GA1UdIwQYMBaAFFNy7ZKc4NrLAVx8fpY1TvLUuFGCMB0GA1UdEQQW MBSBEmRhdmlkQHBvcmtyaW5kLm9yZzCCAUwGA1UdIASCAUMwggE/MIIBOwYLKwYBBAGBtTcB AgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRm MIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAD AgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFjY29yZGluZyB0byB0aGUgQ2xh c3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBvZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5 LCByZWxpYW5jZSBvbmx5IGZvciB0aGUgaW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNl IG9mIHRoZSByZWx5aW5nIHBhcnR5IG9ibGlnYXRpb25zLjA2BgNVHR8ELzAtMCugKaAnhiVo dHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnR1MS1jcmwuY3JsMIGOBggrBgEFBQcBAQSBgTB/ MDkGCCsGAQUFBzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9jbGll bnQvY2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRzL3N1Yi5j bGFzczEuY2xpZW50LmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3LnN0YXJ0c3NsLmNv bS8wDQYJKoZIhvcNAQELBQADggEBAEM1tq8Ddzl6dr2W4odR1XozlEXfny4oZiHJCeyVSTV3 l6JXYrphOEY2JYB/q7YdnjwKyg+p3TH7DL8uOLXu0nU/5rycJJYHQWp/Kn5ZDaZ8KM/Wdr98 h7UBFNHStZCduI6+u31SekHL35Y9nLkGegwhx5+tQhFzsPGmckK9+lmsjPMjS7TctG0sdSC3 uQVmH5BVBlkciQ9lpC8mS7Cdtvh1TVBTaxQZmou5kYXPWuNfjAP4jQk5k9iJejpB9ZU1tU1X k/W69tWKWoBUjBACmE5nyFiFPlw9I/fNoOGDJDaW6gJGehVfCyFe5wnqDj5Jl+SOHePLxGkx XifN281SdpMwggY0MIIEHKADAgECAgEeMA0GCSqGSIb3DQEBBQUAMH0xCzAJBgNVBAYTAklM MRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0 aWZpY2F0ZSBTaWduaW5nMSkwJwYDVQQDEyBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhv cml0eTAeFw0wNzEwMjQyMTAxNTVaFw0xNzEwMjQyMTAxNTVaMIGMMQswCQYDVQQGEwJJTDEW MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlm aWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVy bWVkaWF0ZSBDbGllbnQgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHCYPM zi3YGrEppC4Tq5a+ijKDjKaIQZZVR63UbxIP6uq/I0fhCu+cQhoUfE6ERKKnu8zPf1Jwuk0t svVCk6U9b+0UjM0dLep3ZdE1gblK/1FwYT5Pipsu2yOMluLqwvsuz9/9f1+1PKHG/FaR/wpb fuIqu54qzHDYeqiUfsYzoVflR80DAC7hmJ+SmZnNTWyUGHJbBpA8Q89lGxahNvuryGaC/o2/ ceD2uYDX9U8Eg5DpIpGQdcbQeGarV04WgAUjjXX5r/2dabmtxWMZwhZna//jdiSyrrSMTGKk DiXm6/3/4ebfeZuCYKzN2P8O2F/Xe2AC/Y7zeEsnR7FOp+uXAgMBAAGjggGtMIIBqTAPBgNV HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUU3Ltkpzg2ssBXHx+ljVO 8tS4UYIwHwYDVR0jBBgwFoAUTgvvGqRAW6UXaYcwyjRoQ9BBrvIwZgYIKwYBBQUHAQEEWjBY MCcGCCsGAQUFBzABhhtodHRwOi8vb2NzcC5zdGFydHNzbC5jb20vY2EwLQYIKwYBBQUHMAKG IWh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3Nmc2NhLmNydDBbBgNVHR8EVDBSMCegJaAjhiFo dHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9zZnNjYS5jcmwwJ6AloCOGIWh0dHA6Ly9jcmwuc3Rh cnRzc2wuY29tL3Nmc2NhLmNybDCBgAYDVR0gBHkwdzB1BgsrBgEEAYG1NwECATBmMC4GCCsG AQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRmMDQGCCsGAQUFBwIB FihodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9pbnRlcm1lZGlhdGUucGRmMA0GCSqGSIb3DQEB BQUAA4ICAQAKgwh9eKssBly4Y4xerhy5I3dNoXHYfYa8PlVLL/qtXnkFgdtY1o95CfegFJTw qBBmf8pyTUnFsukDFUI22zF5bVHzuJ+GxhnSqN2sD1qetbYwBYK2iyYA5Pg7Er1A+hKMIzEz cduRkIMmCeUTyMyikfbUFvIBivtvkR8ZFAk22BZy+pJfAoedO61HTz4qSfQoCRcLN5A0t4Dk uVhTMXIzuQ8CnykhExD6x4e6ebIbrjZLb7L+ocR0y4YjCl/Pd4MXU91y0vTipgr/O75CDUHD RHCCKBVmz/Rzkc/b970MEeHt5LC3NiWTgBSvrLEuVzBKM586YoRD9Dy3OHQgWI270g+5MYA8 GfgI/EPT5G7xPbCDz+zjdH89PeR3U4So4lSXur6H6vp+m9TQXPF3a0LwZrp8MQ+Z77U1uL7T elWO5lApsbAonrqASfTpaprFVkL4nyGH+NHST2ZJPWIBk81i6Vw0ny0qZW2Niy/QvVNKbb43 A43ny076khXO7cNbBIRdJ/6qQNq9Bqb5C0Q5nEsFcj75oxQRqlKf6TcvGbjxkJh8BYtv9ePs XklAxtm8J7GCUBthHSQgepbkOexhJ0wP8imUkyiPHQ0GvEnd83129fZjoEhdGwXV27ioRKbj /cIq7JRXun0NbeY+UdMYu9jGfIpDLtUUGSgsg2zMGs5R4jGCA90wggPZAgEBMIGUMIGMMQsw CQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERp Z2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQ cmltYXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0ECAwkFtDAJBgUrDgMCGgUAoIICHTAYBgkq hkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0xNDExMTQyMzQwNDdaMCMG CSqGSIb3DQEJBDEWBBSFIo990JS9aVadJuFPvkkW8iLuyTBsBgkqhkiG9w0BCQ8xXzBdMAsG CWCGSAFlAwQBKjALBglghkgBZQMEAQIwCgYIKoZIhvcNAwcwDgYIKoZIhvcNAwICAgCAMA0G CCqGSIb3DQMCAgFAMAcGBSsOAwIHMA0GCCqGSIb3DQMCAgEoMIGlBgkrBgEEAYI3EAQxgZcw gZQwgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJT ZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBD bGFzcyAxIFByaW1hcnkgSW50ZXJtZWRpYXRlIENsaWVudCBDQQIDCQW0MIGnBgsqhkiG9w0B CRACCzGBl6CBlDCBjDELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4xKzAp BgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25pbmcxODA2BgNVBAMTL1N0 YXJ0Q29tIENsYXNzIDEgUHJpbWFyeSBJbnRlcm1lZGlhdGUgQ2xpZW50IENBAgMJBbQwDQYJ KoZIhvcNAQEBBQAEggEAf1NTseEq9kppbWy6pS+l95preSIsNE2ANy/2tWB9dWpjp5JCn/+/ 1jpOMn6rdxvqD/0+Ke5gt8LD6zEZCvQktnM8hc7nk/z7wV8pSjm4/PfxhVeUtQo8H83Mkh4t 8+b4Wk9HHoOuQ7V6aiJ64ZT9NfOF+GhMP2HrnpJjWYSPw6hG194xbBRHFqx+qJ8JJ45AL/Ib ZhmkRj8MapbMyG+3otlsqhYxONXaJ+wbfn2Ltc07DY89VFz5RhBNfDHjJ2uQkGavXreifypQ AfMIA7Qy/UCiEhY/frUIfV4u9/EKlYRaJZqKlL5zLNfrtfasBjrFXDDi0voQaQ4dGWUmsNtP NgAAAAAAAA== --------------ms020902090302080902040208--