From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lars Magne Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: This Is The Git Help Mailing List Date: Thu, 13 Nov 2014 17:19:31 +0100 Organization: Programmerer Ingebrigtsen Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1415895621 26890 80.91.229.3 (13 Nov 2014 16:20:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 13 Nov 2014 16:20:21 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 13 17:20: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 1Xox82-0007M6-Rn for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 17:20:14 +0100 Original-Received: from localhost ([::1]:60832 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xox82-0007Xz-Az for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 11:20:14 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47711) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xox7d-0007WA-Sn for emacs-devel@gnu.org; Thu, 13 Nov 2014 11:19:56 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xox7X-0003Rh-K6 for emacs-devel@gnu.org; Thu, 13 Nov 2014 11:19:49 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:38530) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xox7X-0003Rc-Eb for emacs-devel@gnu.org; Thu, 13 Nov 2014 11:19:43 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xox7W-00073I-Eb for emacs-devel@gnu.org; Thu, 13 Nov 2014 17:19:42 +0100 Original-Received: from cm-84.215.51.58.getinternet.no ([84.215.51.58]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 13 Nov 2014 17:19:42 +0100 Original-Received: from larsi by cm-84.215.51.58.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 13 Nov 2014 17:19:42 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 18 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.215.51.58.getinternet.no Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAHlBMVEUDJqGFak0FIZwDHZqn BA4qNIewnULAAAD17a0pGXj8ZBkpAAACbUlEQVQ4jWWUz2vbMBTHlRSXHPdGrfToqHjs2Nq07Fpo l+ZmDWK8WzVixTsWTJTekpE477oxBvtv9yTZXkIfxIj30fuhr57C2FuLJWNnb72gtY5OfQWbc+3s 3bF7KCvdGqjeG8jOqY5CXFpwn4wNlFKcP9Ne3nmrBmnXuVYclLILTtEqZAyXmDGW+4wWaCgyWwZN tSGguAZOICDnCLcZGzVmvWXMNQza9zRAxH1xMCuU2GjNXSrXLFaElsbQt6HiXHcHQdqMxtSXc7Vy EWUHxsbAbCZiuTQOdJpcLmZ/o1hy0FNDubraJN9ZDFJDmOtpjccijs51CDIPQY/vNwFAD4IBL0EC xXzJ5jxU2RGQ+qeMg/m8VCHXPcBchV9d8ZBAqWwqe4vFdjiJFeQSoKT9JdiIayvV/hzisJzkuYKF RnRZEhIEXwm8VzdS18aYNe49IJVeBxPa/Nt4q5DkZ2mAjan/qPDxdt6CJxeSJgXuXn/FMQAneUm0 FW5tqjS9vsTvd1yWJOBLczA1ojtGepXGuL/Tkk5uajhQBS9IShbsb+hySFmzXrY9eZCO8gtfd03N siPwsWkbooHYs6H4H7Hz/pfddIVMRFEPDh6s8FATEMMWJEULrGEmWB9hR+cIiEkPxoajbaqZmupH InjkwTV+plEbW/mwqTYitldowS1aO7hJRNyID/rZgxsaXTba2sMFdsn1Nw8+YTakyTZPVo0CA21n 16UaRiKyD2fjh99Nu+sqTa6SqNhhNzb2LyDtbYSdGq2ID53BRb/0gK4C7umBqwW9P6UXalGfRkwf TiN6i5MkTYQ1dgpSYX8iEbaBfzZzEuT9n/ztAAAAAElFTkSuQmCC Mail-Copies-To: never X-Now-Playing: Various's _Deutsche Elektronische Musik 2 (1)_: "Can - Halleluwah" User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:3KoEoE3zqGS0TYxlilTi+IZH1X8= 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:176942 Archived-At: D'oh. Me stupid. I had just forgotten to commit the ChangeLog change, which is why it was complaining about "unstaged" things. And having this in emacs/.gitattributes helps a lot: ChangeLog merge=merge-changelog You need to install the merge-changlog thingie from somewhere, though. I think. It's been a while since I fiddled with this. With that in place, "git pull --rebase; git push" worked perfectly. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no