From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/74148 Path: news.gmane.org!not-for-mail From: Julien Danjou Newsgroups: gmane.emacs.gnus.general Subject: Re: mml2015-epg-sign do not use from header Date: Wed, 17 Nov 2010 19:07:47 +0100 Message-ID: <87ipzvx1qk.fsf@keller.adm.naquadah.org> References: <87k58jqh6u.fsf@hati.baby-gnu.org> <87pqu6uqr7.fsf@hati.baby-gnu.org> <8762vxuifo.fsf@hati.baby-gnu.org> <87zkt9t2ul.fsf@hati.baby-gnu.org> <874obfyj5c.fsf@hati.baby-gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1290017317 26992 80.91.229.12 (17 Nov 2010 18:08:37 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 17 Nov 2010 18:08:37 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M22513@lists.math.uh.edu Wed Nov 17 19:08:32 2010 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PImQk-0000Xw-5G for ding-account@gmane.org; Wed, 17 Nov 2010 19:08:26 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1PImQi-0000Ji-TK; Wed, 17 Nov 2010 12:08:24 -0600 Original-Received: from mx2.math.uh.edu ([129.7.128.33]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1PImQh-0000JU-Pw for ding@lists.math.uh.edu; Wed, 17 Nov 2010 12:08:23 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx2.math.uh.edu with esmtp (Exim 4.72) (envelope-from ) id 1PImQg-0001Q7-Tj for ding@lists.math.uh.edu; Wed, 17 Nov 2010 12:08:23 -0600 Original-Received: from prometheus.naquadah.org ([212.85.154.174] helo=mx1.naquadah.org) by quimby.gnus.org with esmtp (Exim 3.36 #1 (Debian)) id 1PImQg-0001pN-00 for ; Wed, 17 Nov 2010 19:08:22 +0100 Original-Received: by mx1.naquadah.org (Postfix, from userid 8) id D1AB85C168; Wed, 17 Nov 2010 19:07:51 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on prometheus.naquadah.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=4.5 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.3.1 Original-Received: from keller.adm.naquadah.org (unknown [IPv6:2a01:e35:2e39:e900:222:faff:fe9d:ce44]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.naquadah.org (Postfix) with ESMTPSA id 8C0E65C0CC for ; Wed, 17 Nov 2010 19:07:49 +0100 (CET) Original-Received: from jd by keller.adm.naquadah.org with local (Exim 4.72) (envelope-from ) id 1PImQ7-0003Mv-PE for ding@gnus.org; Wed, 17 Nov 2010 19:07:47 +0100 Mail-Followup-To: ding@gnus.org In-Reply-To: (Lars Magne Ingebrigtsen's message of "Wed, 17 Nov 2010 18:13:47 +0100") User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/24.0.50 (gnu/linux) X-Spam-Score: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:74148 Archived-At: On Wed, Nov 17 2010, Lars Magne Ingebrigtsen wrote: > But I'm still not understanding how this git thing is supposed to work. > Many times I pull something, I get a conflict in ChangeLog. So I have > to fix that, and then say "git commit -a", and then I can push. That's because both side have a different ChangeLog. Could I suggest to stop writing ChangeLog, like org-mode did, and starts using git log instead? --=20 Julien Danjou // =E1=90=B0 http://julien.danjou.info