From mboxrd@z Thu Jan 1 00:00:00 1970 From: martinvz Subject: Difference between pull --rebase and fetch+rebase Date: Thu, 7 Jan 2010 04:23:22 -0800 (PST) Message-ID: <27059158.post@talk.nabble.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Jan 07 13:23:44 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.50) id 1NSrOx-0000ks-9k for gcvg-git-2@lo.gmane.org; Thu, 07 Jan 2010 13:23:43 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752196Ab0AGMXe (ORCPT ); Thu, 7 Jan 2010 07:23:34 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751728Ab0AGMXY (ORCPT ); Thu, 7 Jan 2010 07:23:24 -0500 Received: from kuber.nabble.com ([216.139.236.158]:57887 "EHLO kuber.nabble.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751406Ab0AGMXX (ORCPT ); Thu, 7 Jan 2010 07:23:23 -0500 Received: from isper.nabble.com ([192.168.236.156]) by kuber.nabble.com with esmtp (Exim 4.63) (envelope-from ) id 1NSrOc-0003J0-IP for git@vger.kernel.org; Thu, 07 Jan 2010 04:23:22 -0800 X-Nabble-From: martin.von.zweigbergk@gmail.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: I have a branch configured to track a remote branch by rebasing. I excepted that "git pull" would therefore be equivalent to fetching from the remote repository followed by rebasing the remote branch, but it isn't. When doing "git rebase /", it applies only the commits after the merge base. When doing "git pull", it tries to apply two more commits (the two commits preceding the merge base). Why is this? I get the same result even if I do "git pull --rebase ", it doesn't seem to have anything to do with incorrect configuration of the branch. -- View this message in context: http://old.nabble.com/Difference-between-pull---rebase-and-fetch%2Brebase-tp27059158p27059158.html Sent from the git mailing list archive at Nabble.com.