From mboxrd@z Thu Jan 1 00:00:00 1970 From: Enrico Weigelt Subject: Re: Rebasing multiple branches Date: Thu, 30 Dec 2010 06:35:31 +0100 Message-ID: <20101230053530.GA10511@nibiru.local> References: <4D10AE5B.2080700@gmail.com> <4D10B44D.5090309@viscovery.net> <20101222143654.GA4829@nibiru.local> <4D121136.6050906@gmail.com> Reply-To: weigelt@metux.de Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Dec 30 06:42:15 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PYBHC-0001Qn-QC for gcvg-git-2@lo.gmane.org; Thu, 30 Dec 2010 06:42:15 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751247Ab0L3FlZ (ORCPT ); Thu, 30 Dec 2010 00:41:25 -0500 Received: from caprica.metux.de ([82.165.128.25]:48049 "EHLO mailgate.caprica.metux.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750728Ab0L3FlY (ORCPT ); Thu, 30 Dec 2010 00:41:24 -0500 Received: from mailgate.caprica.metux.de (localhost.localdomain [127.0.0.1]) by mailgate.caprica.metux.de (8.14.4/8.14.4) with ESMTP id oBU5b1fJ029894 for ; Thu, 30 Dec 2010 06:37:02 +0100 Received: (from uucp@localhost) by mailgate.caprica.metux.de (8.14.4/8.14.4/Submit) with UUCP id oBU5aUEj029878 for git@vger.kernel.org; Thu, 30 Dec 2010 06:36:30 +0100 Received: (from weigelt@localhost) by nibiru.metux.de (8.12.10/8.12.10) id oBU5ZVfs010960 for git@vger.kernel.org; Thu, 30 Dec 2010 06:35:31 +0100 Mail-Followup-To: git@vger.kernel.org Content-Disposition: inline In-Reply-To: <4D121136.6050906@gmail.com> User-Agent: Mutt/1.4.1i X-Terror: bin laden, kill bush, Briefbombe, Massenvernichtung, KZ, X-Nazi: Weisse Rasse, Hitlers Wiederauferstehung, 42, X-Antichrist: weg mit schaeuble, ausrotten, heiliger krieg, al quaida, X-Killer: 23, endloesung, Weltuntergang, X-Doof: wer das liest ist doof Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: * Leonid Podolny wrote: > Ah, nice. I didn't notice the -p option. However, the man page advises > against using -p and -i together. Last time I checked, -i required -p ... cu -- ---------------------------------------------------------------------- Enrico Weigelt, metux IT service -- http://www.metux.de/ phone: +49 36207 519931 email: weigelt@metux.de mobile: +49 151 27565287 icq: 210169427 skype: nekrad666 ---------------------------------------------------------------------- Embedded-Linux / Portierung / Opensource-QM / Verteilte Systeme ----------------------------------------------------------------------