From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jonas Bernoulli Newsgroups: gmane.emacs.devel Subject: Re: git is screwed Date: Fri, 27 Mar 2015 00:41:07 +0100 Message-ID: <87iodn8gz0.fsf@bernoul.li> References: <20150322154147.GA6808@Tron.local> <20150323045209.GA71859@Tron.local> <550FE343.8010607@math.ntnu.no> <87zj707jca.fsf@bernoul.li> <87h9t89hpd.fsf@gmx.us> <877fu3r3a3.fsf@mango.localdomain> <87iodntw44.fsf@gmx.us> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1427413555 31573 80.91.229.3 (26 Mar 2015 23:45:55 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 26 Mar 2015 23:45:55 +0000 (UTC) Cc: rekado@elephly.net, emacs-devel@gnu.org To: Rasmus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 27 00:45:44 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 1YbHT1-0004RV-3f for ged-emacs-devel@m.gmane.org; Fri, 27 Mar 2015 00:45:39 +0100 Original-Received: from localhost ([::1]:46979 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbHT0-0004Kv-Gk for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 19:45:38 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46090) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbHSd-0004Kc-Sl for emacs-devel@gnu.org; Thu, 26 Mar 2015 19:45:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YbHSY-0004pi-2x for emacs-devel@gnu.org; Thu, 26 Mar 2015 19:45:15 -0400 Original-Received: from mail.hostpark.net ([212.243.197.30]:51714) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbHSX-0004lO-SD for emacs-devel@gnu.org; Thu, 26 Mar 2015 19:45:10 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by mail.hostpark.net (Postfix) with ESMTP id C17F21786C; Fri, 27 Mar 2015 00:45:06 +0100 (CET) X-Virus-Scanned: by Hostpark/NetZone Mailprotection at hostpark.net Original-Received: from mail.hostpark.net ([127.0.0.1]) by localhost (mail1.hostpark.net [127.0.0.1]) (amavisd-new, port 10124) with ESMTP id JFvxAOkDLCOf; Fri, 27 Mar 2015 00:45:06 +0100 (CET) Original-Received: from lem (80-218-80-138.dclient.hispeed.ch [80.218.80.138]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.hostpark.net (Postfix) with ESMTPSA id 9013017869; Fri, 27 Mar 2015 00:45:06 +0100 (CET) In-reply-to: <87iodntw44.fsf@gmx.us> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.243.197.30 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:184353 Archived-At: Rasmus writes: > Ricardo Wurmus writes: > >> Rasmus writes: >> >>> to do that /without/ magit. E.g. rebase -i and branch I find easier from >>> CLI, though I try to force myself to explore magit more. >> >> Interactive rebasing is really convenient with magit-log, in my opinion. >> >> I just select the commit from which I want to rebase and hit E. In the >> resulting buffer I can move around commits or mark them for further >> actions. This is not git's rebase but "rewriting" which is a Magit specific and very bad implementation of the same basic idea. I have removed it from the next branch. Don't use it. > Thanks for the tip. It sounds cool, and I'll check it out. I never > considered doing it from the the log view. I think the manual mentions R > or something like that from the main view, but I checked it a while back. That's one area that has seen many improvements on the next branch. Some preliminary documentation can be found here: https://github.com/magit/magit/wiki/History-Manipulation.