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: [Emacs-diffs] master f9fabb2 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Date: Fri, 29 May 2015 08:20:05 +0600 Message-ID: References: <20150527165006.32357.80915@vcs.savannah.gnu.org> <87egm13yrm.fsf@gmx.de> <83bnh4ydci.fsf@gnu.org> <87a8wo3fyk.fsf@gmx.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1432866040 8267 80.91.229.3 (29 May 2015 02:20:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 29 May 2015 02:20:40 +0000 (UTC) Cc: Eli Zaretskii , Michael Albinus , Emacs developers To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri May 29 04:20:35 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 1Yy9uU-0005Ek-G3 for ged-emacs-devel@m.gmane.org; Fri, 29 May 2015 04:20:34 +0200 Original-Received: from localhost ([::1]:33128 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yy9uT-0001vW-NU for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 22:20:33 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60838) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yy9uQ-0001vF-0J for emacs-devel@gnu.org; Thu, 28 May 2015 22:20:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yy9uP-0000lu-6J for emacs-devel@gnu.org; Thu, 28 May 2015 22:20:29 -0400 Original-Received: from mail-la0-x22b.google.com ([2a00:1450:4010:c03::22b]:33645) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yy9uM-0000in-R3; Thu, 28 May 2015 22:20:26 -0400 Original-Received: by labpy14 with SMTP id py14so33876780lab.0; Thu, 28 May 2015 19:20:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; bh=oNo07k6tqEzeigNzovwGry2VkBpLQivGI/3MmoK9l8k=; b=m6AuJaCm75EnkNUrU1a8ekshhPrU1hpEkZ0KQiN9zVtCxEVv2hGpOhRPUnGlkfocz5 6fQVlTqhRI30q5mlN25od3bEizgUR435c30hDdGhJ+6c02DPB1HAO7lrp+Ii8NLMGcB0 h6MJyhPdltBw7Ak7dNEr+9zMBHhY8q7G6zZgYq5MIw/9svRU8Sir11E79S6w0hMtHzx2 1ekOhc7alMJwlCliuJO/yOJ1xuSRA1A30GH1rl5uz4Soyb7vEyWcqslVZMennOgCofFO fPrBcMK2FmBZzxC9JDpi2in1WRAZs6Z7B0GYHNQYFIRNbsWu2VJd/bALe+0tTFvwh8aB P+2Q== X-Received: by 10.112.13.98 with SMTP id g2mr5820026lbc.102.1432866025992; Thu, 28 May 2015 19:20:25 -0700 (PDT) Original-Received: by 10.25.43.65 with HTTP; Thu, 28 May 2015 19:20:05 -0700 (PDT) In-Reply-To: X-Google-Sender-Auth: yH3nhK6_t9YURIw5bATNQ7jwjrg X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::22b 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:186938 Archived-At: On Fri, May 29, 2015 at 1:02 AM, Stefan Monnier wrote: > I should sit down and write a "git update" command which would work like > "git pull" but which pulls the current branch into the other branch > instead of the other way around. You might want to look at github:nvie/gitflow, especially its "git flow feature finish" command.