From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Artur Malabarba Newsgroups: gmane.emacs.devel Subject: Re: git is screwed Date: Wed, 25 Mar 2015 10:29:17 +0000 Message-ID: References: <20150322154147.GA6808@Tron.local> <20150323045209.GA71859@Tron.local> <550FE343.8010607@math.ntnu.no> Reply-To: bruce.connor.am@gmail.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1427279418 13313 80.91.229.3 (25 Mar 2015 10:30:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 25 Mar 2015 10:30:18 +0000 (UTC) To: emacs-devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Mar 25 11:30:18 2015 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 1YaiZi-0001aQ-RL for ged-emacs-devel@m.gmane.org; Wed, 25 Mar 2015 11:30:14 +0100 Original-Received: from localhost ([::1]:37817 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaiZh-0001Em-Pg for ged-emacs-devel@m.gmane.org; Wed, 25 Mar 2015 06:30:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39067) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaiYq-0000ka-HE for emacs-devel@gnu.org; Wed, 25 Mar 2015 06:29:21 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YaiYp-0007y7-Dv for emacs-devel@gnu.org; Wed, 25 Mar 2015 06:29:20 -0400 Original-Received: from mail-lb0-x233.google.com ([2a00:1450:4010:c04::233]:35220) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaiYp-0007wd-7P for emacs-devel@gnu.org; Wed, 25 Mar 2015 06:29:19 -0400 Original-Received: by lbcgn8 with SMTP id gn8so13988698lbc.2 for ; Wed, 25 Mar 2015 03:29:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:sender:in-reply-to:references:date:message-id :subject:from:to:content-type; bh=Iw3/uyMvbAxBF2Y40qPn0WFSSiM9mnKmXd+WFZvVQIs=; b=a4FD1Vlygqs4vQPK3buCKtlwiwItnFSFsXnN5EU0auc5m9wCXqNLC07wAPnFxinh9v KLsWFFizNyCz0tC6S2YtWKnmCAlRecUHgsjr6DaVc074aW3d/r7OkeGq726i++dLq0dY yhyROwEdXf1xd8aD94ShvRWl9eHbkYz3/QF/BWVbNwdtzZq0oB9NXCgg4mhbJ6eEJSpJ hUnu+8nPv/qoAgjGbuedWormzg0k1boi7KYdHq7wDs0m6bHzV2bVFOnHV5BzkZQhLOPc mMea3vH+/apaAFHhe122k1Y+vWek3ArShRHRSykGdBuJ6COGEFLRA4e7G1uic1ShAAP6 0/lA== X-Received: by 10.112.110.231 with SMTP id id7mr7954914lbb.28.1427279357543; Wed, 25 Mar 2015 03:29:17 -0700 (PDT) Original-Received: by 10.112.207.225 with HTTP; Wed, 25 Mar 2015 03:29:17 -0700 (PDT) In-Reply-To: X-Google-Sender-Auth: b2-DvISVpi2VFNF79KA7-N1mq10 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::233 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:184212 Archived-At: 2015-03-25 8:29 GMT+00:00 Steinar Bang : >>>>>> Richard Stallman : > >> Can someone tell me a full recipe for how to repair lisp/ChangeLog >> (perhaps, merge it by hand) and how to get the new version into >> the real repository? > > I use magit (not (yet) on GNU Elpa, but available on marmalade (version > 1.2.2) and Melpa (commit-triggered builds from magit git repo)), and > what I do, is: Same here. Magit essentially took me from "I know git commit/push/pull" to being (almost) a git expert. I'd strongly recommend it to anyone, even those strugling with the concepts of git.