From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Sven Axelsson Newsgroups: gmane.emacs.devel Subject: Re: Should we restore manually maintained ChangeLogs Date: Thu, 10 Mar 2016 12:49:34 +0100 Message-ID: References: <83lh5utbxb.fsf@gnu.org> <56DDD02A.20809@cs.ucla.edu> <83fuw2t2ue.fsf@gnu.org> <56DE0F6A.6010207@cs.ucla.edu> <83pov5rmt6.fsf@gnu.org> <56DFD78F.40205@cs.ucla.edu> <56E06093.7050509@cs.ucla.edu> <83twkfo7ij.fsf@gnu.org> <20160309181005.GF3948@acm.fritz.box> <87vb4vuu59.fsf@thinkpad.rath.org> <87pov3nrnm.fsf@linux-m68k.org> <83mvq6n7xs.fsf@gnu.org> <83d1r2mzuy.fsf@gnu.org> <8360wumxj4.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1457610595 32145 80.91.229.3 (10 Mar 2016 11:49:55 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 10 Mar 2016 11:49:55 +0000 (UTC) Cc: Andreas Schwab , emacs To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 10 12:49:54 2016 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 1adz6H-0003SH-7D for ged-emacs-devel@m.gmane.org; Thu, 10 Mar 2016 12:49:53 +0100 Original-Received: from localhost ([::1]:47727 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adz6G-00008A-KA for ged-emacs-devel@m.gmane.org; Thu, 10 Mar 2016 06:49:52 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58567) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adz62-000084-6t for emacs-devel@gnu.org; Thu, 10 Mar 2016 06:49:39 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adz61-00063m-61 for emacs-devel@gnu.org; Thu, 10 Mar 2016 06:49:38 -0500 Original-Received: from mail-vk0-x232.google.com ([2607:f8b0:400c:c05::232]:34953) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adz60-00063T-U0; Thu, 10 Mar 2016 06:49:37 -0500 Original-Received: by mail-vk0-x232.google.com with SMTP id e6so91952753vkh.2; Thu, 10 Mar 2016 03:49:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc; bh=qHfRRGvvw0/uR4ZxSilHQQW8HG65q9xOzU/3grNKOO0=; b=h9jUtKINPfx5SJaNDeC2NkUrYJP69qQ4E/95CqVagA0GYWZPCzenD3UOmsV8lDdQ1N B/khdtFE4lH5/s/7LxFcDMDWyKgpjln+Nz1RCQoRfj+QUFRyF4gvvqYdpBmkIhdYEaWY GIWWjiw/7ePUsMtpk/Bjo3dulfVFSXwmW5C6+5b1rTaESXYdz4gy85lqvpnviG3T5DXJ XKrXwHbOU39cywhRH4d6zW7CmQDlSNrG0Dwb5y8iR5ewihx8deVnx9X+uvn3gTqH+b+9 UQL2TDyOkdLOp1v3OMnMRqhAbg3dw9xhInMz6Jp37Lw8R0at7iTz38G7tJ3ELn0VciAe AwGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc; bh=qHfRRGvvw0/uR4ZxSilHQQW8HG65q9xOzU/3grNKOO0=; b=M7pdf7viIVQurZpWxbncCHnp3EQOPngr5/6NLY0P5ljjMsxgzku3QpgLMEMVg0Ox87 RLsp36W/Z17jlaejOYWOivkBiOPyZutdTYEnx8pT9T/cGTGrt5VzC4LgDony/on+lf21 1fmvN7k+HAHgeEke8cFSqxJCeLSgdX4AdhShW4MOeruFoSuHIQC0xJjJ9C5vejVgn8HK CGZTvRUZnQ1U6oZxoQxmdpLpYkKfZjelRW1KI5YfBxKBdLzHRzH3GHW38Yb5DfInX2QZ LTIcu24CkPDTCjWFOEnc6AE45YPURUtOnbzgPtGbejz1g+faPJ5BK6hYFX8GExTWqJ4v 7QHg== X-Gm-Message-State: AD7BkJIgPoy1tBxUd+RobwY/JCG9yJh6q7zH9mpY1d1Ad9E7gugLzCWxEAlQezcACetQWAcLM6SAcdNQM9ZCyQ== X-Received: by 10.31.49.138 with SMTP id x132mr3018967vkx.33.1457610574700; Thu, 10 Mar 2016 03:49:34 -0800 (PST) Original-Received: by 10.31.83.4 with HTTP; Thu, 10 Mar 2016 03:49:34 -0800 (PST) In-Reply-To: <8360wumxj4.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400c:c05::232 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:201369 Archived-At: On 10 March 2016 at 11:34, Eli Zaretskii wrote: >> From: Andreas Schwab >> Cc: emacs-devel@gnu.org >> Date: Thu, 10 Mar 2016 11:00:47 +0100 >> >> > More generally, can we put something in .git/config that would cause >> > that namespace to be pulled by default? >> >> git config --add remote.origin.fetch +refs/replace/*:refs/replace/* > > OK, thanks. > > So how does one go about creating a replacement commit for a commit > that was pushed upstream? The man page of "git replace" mentions "git > rebase", but I cannot find anything pertinent on the rebase man page. > The procedure described here: > > https://git-scm.com/book/en/v2/Git-Tools-Replace > > sounds quite complicated. If we need to do all that every time we > want to fix a single commit, I'd expect a lot of mistakes and snafus. > But maybe there's an easier way, in which case we could consider this > feature as part of the solution for fixing mistakes in log messages. > When you only want to deal with changing the commit message and not the actual commit, it is as simple as calling `git replace --edit '. This will bring up your system editor where you can change the commit message. Doing it this way will not change history. -- Sven Axelsson ++++++++++[>++++++++++>+++++++++++>++++++++++>++++++ >++++<<<<<-]>++++.+.++++.>+++++.>+.<<-.>>+.>++++.<<. +++.>-.<<++.>>----.<++.>>>++++++.<<<<.>>++++.<----.