From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Yuri Khan Newsgroups: gmane.emacs.devel Subject: Re: Recording the date at which a change was pushed to Savannah Date: Thu, 4 Dec 2014 09:52:17 +0700 Message-ID: References: <9e4mtd1cdi.fsf@fencepost.gnu.org> <87r3whkw6w.fsf@uwakimon.sk.tsukuba.ac.jp> <87388xw2pn.fsf@fencepost.gnu.org> <83fvcw6281.fsf@gnu.org> <83bnnk5z9g.fsf@gnu.org> <83a9345vmt.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1417661554 24471 80.91.229.3 (4 Dec 2014 02:52:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 4 Dec 2014 02:52:34 +0000 (UTC) Cc: Eli Zaretskii , David Kastrup , Emacs developers To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 04 03:52:27 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 1XwMWo-0003rl-B0 for ged-emacs-devel@m.gmane.org; Thu, 04 Dec 2014 03:52:26 +0100 Original-Received: from localhost ([::1]:44219 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwMWn-0005UI-Ui for ged-emacs-devel@m.gmane.org; Wed, 03 Dec 2014 21:52:25 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwMWk-0005U8-Fb for emacs-devel@gnu.org; Wed, 03 Dec 2014 21:52:23 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XwMWj-000612-JR for emacs-devel@gnu.org; Wed, 03 Dec 2014 21:52:22 -0500 Original-Received: from mail-ie0-x22c.google.com ([2607:f8b0:4001:c03::22c]:62357) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwMWg-00060e-Lf; Wed, 03 Dec 2014 21:52:18 -0500 Original-Received: by mail-ie0-f172.google.com with SMTP id tr6so15145052ieb.3 for ; Wed, 03 Dec 2014 18:52:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=p/6HEVGKzssQU8ps2+CXnIJAxYW7IVZ22gS8LFXlEo0=; b=oNCpLBuCA8J8Q0fBOA1TyjDE5sJIv2xm6DhugnzhBQNtNi2w4QDgFUTAzzLpzij3/A HdgIkLPKldvsQLoG21nBVuuroOITyH1d2xixQn1V109SHzUvGb2OYazZl+7OXB8k5ygg xgu1PpU1ENElrRc+AhYFPeB88cRz4SjUaxS3jez2ARIOu87IvVASjYGILitV6VqsudUb MGfrzrPb4dwSEPIKR1COsOQ2+Dap1Qs8UX0D3k4n3hmuM7JrL6DtbfNNOa3Adx9Ttro2 ks5vmQcTp3k2i+/CSrQbaKnLnNpYTYqFX74yIX4DUlnTRdYAXuCN4lmqZ2//nWpYBva1 jqgQ== X-Received: by 10.50.8.71 with SMTP id p7mr11776329iga.9.1417661538012; Wed, 03 Dec 2014 18:52:18 -0800 (PST) Original-Received: by 10.107.48.82 with HTTP; Wed, 3 Dec 2014 18:52:17 -0800 (PST) In-Reply-To: X-Google-Sender-Auth: bmwnSaX1UNwp0JjcMy7sEdAaIAM X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c03::22c 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:178789 Archived-At: On Thu, Dec 4, 2014 at 3:10 AM, Stefan Monnier w= rote: >>> git commit >>> git pull >>> >>> git push Assuming you=E2=80=99re doing this on local master and the pull brings in n= ew commits from the remote master, this, indeed, introduces a backwards merge. >> That's why we recommend "git pull --rebase" in this case (and I >> actually pull.rebase =3D preserve in my .gitconfig). +1. > There might also be a way to ask Git to generate the "merge commit" with > its two parent swapped. Yes and it=E2=80=99s called $ git branch temp; git checkout master; A: git fetch; git reset --hard origin/master; git merge temp; git push origin master || goto A; git branch --delete temp (retroactively create a local feature branch and merge that into fully up-to-date master).