From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Tom Clarke" Subject: Re: What's cooking in git.git (topics) Date: Wed, 26 Sep 2007 23:53:38 +0200 Message-ID: <550f9510709261453l6ff50017s9145ee234f39a07@mail.gmail.com> References: <7v1wdcch06.fsf@gitster.siamese.dyndns.org> <7v1wd1d0le.fsf@gitster.siamese.dyndns.org> <7vfy11yyxk.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: "Junio C Hamano" , git@vger.kernel.org To: "Johannes Schindelin" X-From: git-owner@vger.kernel.org Wed Sep 26 23:53:50 2007 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1IaepI-0001In-3B for gcvg-git-2@gmane.org; Wed, 26 Sep 2007 23:53:48 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754619AbXIZVxl (ORCPT ); Wed, 26 Sep 2007 17:53:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752352AbXIZVxl (ORCPT ); Wed, 26 Sep 2007 17:53:41 -0400 Received: from rv-out-0910.google.com ([209.85.198.187]:30704 "EHLO rv-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753868AbXIZVxk (ORCPT ); Wed, 26 Sep 2007 17:53:40 -0400 Received: by rv-out-0910.google.com with SMTP id k20so2131185rvb for ; Wed, 26 Sep 2007 14:53:40 -0700 (PDT) Received: by 10.114.192.1 with SMTP id p1mr1661070waf.1190843618931; Wed, 26 Sep 2007 14:53:38 -0700 (PDT) Received: by 10.35.86.2 with HTTP; Wed, 26 Sep 2007 14:53:38 -0700 (PDT) In-Reply-To: Content-Disposition: inline Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: On 9/26/07, Johannes Schindelin wrote: > Together with a resubmitted git-merge-rebase.sh (hint, hint), the > mergeOptions would be quite useful for a workflow where you want to rebase > on top of an upstream quite often. I'll resubmit merge rebase tomorrow :-) -Tom